Fix JRuby ext loading to report better errors (where it reported none…

… before). (cherry picked from commit 68976c3)
rkh · Sep 13, 2011 · e17cdf7 · e17cdf7
1 parent 33711f6
commit e17cdf7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/org/jruby/javasupport/JavaSupport.java b/src/org/jruby/javasupport/JavaSupport.java
@@ -129,7 +129,7 @@ public void setActive(boolean active) {
         this.active = active;
     }
 
-    private Class loadJavaClass(String className) throws ClassNotFoundException {
+    public Class loadJavaClass(String className) throws ClassNotFoundException {
         Class primitiveClass;
         if ((primitiveClass = PRIMITIVE_CLASSES.get(className)) == null) {
             if (!Ruby.isSecurityRestricted()) {

diff --git a/src/org/jruby/runtime/load/LoadService.java b/src/org/jruby/runtime/load/LoadService.java
@@ -613,11 +613,20 @@ public boolean trySearch(SearchState state) {
                 }
 
                 // quietly try to load the class
-                Class theClass = runtime.getJavaSupport().loadJavaClassQuiet(className);
+                Class theClass = runtime.getJavaSupport().loadJavaClass(className);
                 state.library = new ClassExtensionLibrary(className + ".java", theClass);
-            } catch (Exception ee) {
-                state.library = null;
-                runtime.getGlobalVariables().clear("$!");
+            } catch (ClassNotFoundException cnfe) {
+                if (runtime.isDebug()) cnfe.printStackTrace();
+                // we ignore this and assume the jar is not an extension
+            } catch (UnsupportedClassVersionError ucve) {
+                if (runtime.isDebug()) ucve.printStackTrace();
+                throw runtime.newLoadError("JRuby ext built for wrong Java version in `" + finName + "': " + ucve);
+            } catch (IOException ioe) {
+                if (runtime.isDebug()) ioe.printStackTrace();
+                throw runtime.newLoadError("IOException loading extension `" + finName + "`: " + ioe);
+            } catch (Exception e) {
+                if (runtime.isDebug()) e.printStackTrace();
+                throw runtime.newLoadError("Exception loading extension `" + finName + "`: " + e);
             }
 
             // If there was a good library before, we go back to that