deprecate JRubyClassLoader#tearDown in favor of close() (we're Closab…

…le on Java 7+)
jruby · Jul 25, 2015 · aaa4687 · aaa4687 · bbrowning · Jul 28, 2015
1 parent 5571756
commit aaa4687
Showing 4 changed files with 18 additions and 30 deletions.
diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -3308,7 +3308,7 @@ public void tearDown(boolean systemExit) {
 
         getSelectorPool().cleanup();
 
-        tearDownClassLoader();
+        releaseClassLoader();
 
         if (config.isProfilingEntireRun()) {
             // not using logging because it's formatted
@@ -3333,9 +3333,9 @@ public void tearDown(boolean systemExit) {
         }
     }
 
-    private void tearDownClassLoader() {
+    private void releaseClassLoader() {
         if (getJRubyClassLoader() != null) {
-            getJRubyClassLoader().tearDown(isDebug());
+            getJRubyClassLoader().close();
         }
     }
 

diff --git a/core/src/main/java/org/jruby/embed/ScriptingContainer.java b/core/src/main/java/org/jruby/embed/ScriptingContainer.java
@@ -29,16 +29,11 @@
  */
 package org.jruby.embed;
 
-import java.io.UnsupportedEncodingException;
-
-import org.jruby.embed.internal.LocalContextProvider;
-
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.Reader;
 import java.io.Writer;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.List;
@@ -1859,10 +1854,6 @@ public void terminate() {
         LocalContextProvider provider = getProvider();
         if (provider.isRuntimeInitialized()) {
             provider.getRuntime().tearDown(false);
-            try {
-                getProvider().getRuntime().getJRubyClassLoader().close();
-            }
-            catch(IOException weTriedIt){}
         }
         provider.terminate();
     }

diff --git a/core/src/main/java/org/jruby/util/ClassDefiningJRubyClassLoader.java b/core/src/main/java/org/jruby/util/ClassDefiningJRubyClassLoader.java
@@ -31,9 +31,6 @@
 import java.net.URLClassLoader;
 import java.security.ProtectionDomain;
 
-import org.jruby.util.log.Logger;
-import org.jruby.util.log.LoggerFactory;
-
 public class ClassDefiningJRubyClassLoader extends URLClassLoader implements ClassDefiningClassLoader {
 
     final static ProtectionDomain DEFAULT_DOMAIN;

diff --git a/core/src/main/java/org/jruby/util/JRubyClassLoader.java b/core/src/main/java/org/jruby/util/JRubyClassLoader.java
@@ -104,28 +104,28 @@ public void addURL(URL url) {
     }
 
     /**
-     * Called when the parent runtime is torn down.
+     * @deprecated use {@link #close()} instead
      */
     public void tearDown(boolean debug) {
+        close();
+    }
+
+    /**
+     * Called when the parent runtime is torn down.
+     */
+    @Override
+    public void close() {
+        try {
+            super.close();
+        }
+        catch (Exception ex) { LOG.debug(ex); }
+
         try {
             // A hack to allow unloading all JDBC Drivers loaded by this classloader.
             // See http://bugs.jruby.org/4226
             getJDBCDriverUnloader().run();
         }
-        catch (Exception e) {
-            if (debug) LOG.debug(e);
-        }
-        // if we're on Java 7+ call URLClassLoader#close :
-        try {
-            URLClassLoader.class.getMethod("close").invoke(this);
-        }
-        catch (NoSuchMethodException ex) { /* noop on Java 6 */ }
-        catch (IllegalAccessException ex) {
-            LOG.info("unexpected illegal access: ", ex);
-        }
-        catch (Exception ex) {
-            LOG.debug(ex);
-        }
+        catch (Exception ex) { LOG.debug(ex); }
     }
 
     @Deprecated