jruby · Jul 29, 2015 · Jul 29, 2015 · Jul 29, 2015 · Jul 29, 2015
Showing with 7 additions and 18 deletions.

+6 −6 core/src/main/java/org/jruby/Ruby.java

+0 −1 core/src/main/java/org/jruby/embed/ScriptingContainer.java

+1 −11 core/src/main/java/org/jruby/util/JRubyClassLoader.java
diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -2930,8 +2930,6 @@ public void compileAndLoadFile(String filename, InputStream in, boolean wrap) {
         InputStream readStream = in;
 
         Script script = null;
-        ScriptAndCode scriptAndCode = null;
-        String className = null;
 
         try {
             // read full contents of file, hash it, and try to load that class first
@@ -2943,12 +2941,12 @@ public void compileAndLoadFile(String filename, InputStream in, boolean wrap) {
             }
             buffer = baos.toByteArray();
             String hash = JITCompiler.getHashForBytes(buffer);
-            className = JITCompiler.RUBY_JIT_PREFIX + ".FILE_" + hash;
+            final String className = JITCompiler.RUBY_JIT_PREFIX + ".FILE_" + hash;
 
             // FIXME: duplicated from ClassCache
             Class contents;
             try {
-                contents = jrubyClassLoader.loadClass(className);
+                contents = getJRubyClassLoader().loadClass(className);
                 if (RubyInstanceConfig.JIT_LOADING_DEBUG) {
                     LOG.info("found jitted code for " + filename + " at class: " + className);
                 }
@@ -2974,7 +2972,9 @@ public void compileAndLoadFile(String filename, InputStream in, boolean wrap) {
         // script was not found in cache above, so proceed to compile
         RootNode scriptNode = (RootNode) parseFile(readStream, filename, null);
         if (script == null) {
-            scriptAndCode = tryCompile(scriptNode, new ClassDefiningJRubyClassLoader(jrubyClassLoader));
+            ScriptAndCode scriptAndCode = tryCompile(scriptNode,
+                new ClassDefiningJRubyClassLoader(getJRubyClassLoader())
+            );
             if (scriptAndCode != null) script = scriptAndCode.script();
         }
 
@@ -3341,7 +3341,7 @@ public void tearDown(boolean systemExit) {
      * release the runtime loader but not otherwise - you should do that manually.
      */
     public void releaseClassLoader() {
-        JRubyClassLoader.close( getJRubyClassLoader() );
+        if ( jrubyClassLoader != null ) getJRubyClassLoader().close();
     }
 
     /**

diff --git a/core/src/main/java/org/jruby/embed/ScriptingContainer.java b/core/src/main/java/org/jruby/embed/ScriptingContainer.java
@@ -1854,7 +1854,6 @@ public void terminate() {
         LocalContextProvider provider = getProvider();
         if (provider.isRuntimeInitialized()) {
             provider.getRuntime().tearDown(false);
-            // NOTE: Ruby#tearDown does getJRubyClassLoader().tearDown()
             provider.getRuntime().releaseClassLoader();
         }
         provider.terminate();

diff --git a/core/src/main/java/org/jruby/util/JRubyClassLoader.java b/core/src/main/java/org/jruby/util/JRubyClassLoader.java
@@ -135,17 +135,7 @@ public void close() {
      */
     public static void close(final JRubyClassLoader loader) {
         if ( loader == null ) return;
-        // URLClassLoader#close only available since Java 7 :
-        try {
-            URLClassLoader.class.getMethod("close").invoke(loader);
-        }
-        catch (NoSuchMethodException ex) { /* noop on Java 6 */ }
-        catch (IllegalAccessException ex) {
-            LOG.info("unexpected illegal access: ", ex);
-        }
-        catch (Exception ex) {
-            LOG.debug(ex);
-        }
+        loader.close();
     }
 
     @Deprecated