[Truffle] Translate load errors for JRuby when file can't be loaded v…

…ia '-r' switch.
jruby · Apr 21, 2015 · 260cae0 · 260cae0
1 parent 6f90864
commit 260cae0
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/TruffleBridgeImpl.java b/truffle/src/main/java/org/jruby/truffle/TruffleBridgeImpl.java
@@ -155,6 +155,13 @@ public void init() {
                 truffleContext.getFeatureManager().require(requiredLibrary, null);
             } catch (IOException e) {
                 throw new RuntimeException(e);
+            } catch (RaiseException e) {
+                // Translate LoadErrors for JRuby since we're outside an ExceptionTranslatingNode.
+                if (e.getRubyException().getLogicalClass() == truffleContext.getCoreLibrary().getLoadErrorClass()) {
+                    throw truffleContext.getRuntime().newLoadError(e.getRubyException().getMessage().toString(), requiredLibrary);
+                } else {
+                    throw e;
+                }
             }
         }