Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 51075bfe899e
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9cdc9830eef2
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 14, 2016

  1. Adjusting the code to not expect IOException from PolyglotEngine.eval…

    … and co.
    Jaroslav Tulach committed Jul 14, 2016
    Copy the full SHA
    583a4dc View commit details

Commits on Jul 15, 2016

  1. Merge pull request #4015 from jtulach/jtulach/NoIOException

    Adjusting the code to not expect IOException from PolyglotEngine.eval
    chrisseaton authored Jul 15, 2016
    Copy the full SHA
    9cdc983 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 truffle/src/main/java/org/jruby/truffle/language/loader/FeatureLoader.java
Original file line number Diff line number Diff line change
@@ -148,7 +148,7 @@ private CallTarget getCExtLibRuby() {

try {
return parseSource(context.getSourceLoader().load(path));
} catch (IOException e) {
} catch (Exception e) {
throw new JavaException(e);
}
}
@@ -157,7 +157,7 @@ private CallTarget getCExtLibRuby() {
public CallTarget parseSource(Source source) {
try {
return context.getEnv().parse(source);
} catch (IOException e) {
} catch (Exception e) {
throw new JavaException(e);
}
}