jruby · Oct 31, 2017 · Oct 31, 2017 · Oct 31, 2017 · Oct 31, 2017
diff --git a/core/src/main/java/org/jruby/embed/internal/SingleThreadLocalContextProvider.java b/core/src/main/java/org/jruby/embed/internal/SingleThreadLocalContextProvider.java
@@ -29,10 +29,11 @@
  */
 package org.jruby.embed.internal;
 
-import java.util.Map;
 import org.jruby.Ruby;
 import org.jruby.embed.LocalVariableBehavior;
 
+import java.util.Map;
+
 /**
  *
  * @author Yoko Harada <yokolet@gmail.com>

diff --git a/core/src/main/java/org/jruby/util/JRubyClassLoader.java b/core/src/main/java/org/jruby/util/JRubyClassLoader.java
@@ -37,6 +37,9 @@
 import java.io.OutputStream;
 import java.lang.management.ManagementFactory;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 import org.jruby.util.log.Logger;
 import org.jruby.util.log.LoggerFactory;
@@ -62,6 +65,8 @@ public class JRubyClassLoader extends ClassDefiningJRubyClassLoader {
 
     private static volatile File tempDir;
 
+    private List<String> cachedJarPaths = Collections.synchronizedList(new ArrayList<String>());
+
     public JRubyClassLoader(ClassLoader parent) {
         super(parent);
     }
@@ -86,6 +91,8 @@ public void addURL(URL url) {
                 out.close();
                 in.close();
                 url = f.toURI().toURL();
+
+                cachedJarPaths.add(URLUtil.getPath(url));
             }
             catch (IOException e) {
                 throw new RuntimeException("BUG: we can not copy embedded jar to temp directory", e);
@@ -183,6 +190,23 @@ public void close() {
             getJDBCDriverUnloader().run();
         }
         catch (Exception ex) { LOG.debug(ex); }
+
+        terminateJarIndexCacheEntries();
+    }
+
+    protected void terminateJarIndexCacheEntries() {
+        for (String jarPath : cachedJarPaths){
+            try {
+                // Remove reference from jar cache
+                JarResource.removeJarResource(jarPath);
+
+                // Delete temp jar on disk
+                File jarFile = new File(jarPath);
+                jarFile.delete();
+            } catch (Exception e) {
+                // keep trying to clean up other temp jars
+            }
+        }
     }
 
     @Deprecated

diff --git a/core/src/main/java/org/jruby/util/JarCache.java b/core/src/main/java/org/jruby/util/JarCache.java
@@ -153,4 +153,20 @@ public JarIndex getIndex(String jarPath) {
             return index;
         }
     }
+
+    public boolean remove(String jarPath){
+        String cacheKey = jarPath;
+
+        synchronized (indexCache) {
+            JarIndex index = indexCache.get(cacheKey);
+            if (index == null){
+                return false;
+            }
+            else{
+                index.release();
+                indexCache.remove(cacheKey);
+                return true;
+            }
+        }
+    }
 }
diff --git a/core/src/main/java/org/jruby/util/JarResource.java b/core/src/main/java/org/jruby/util/JarResource.java
@@ -8,7 +8,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-abstract class JarResource extends AbstractFileResource {
+public abstract class JarResource extends AbstractFileResource {
     private static Pattern PREFIX_MATCH = Pattern.compile("^(?:jar:)?(?:file:)?(.*)$");
 
     private static final JarCache jarCache = new JarCache();
@@ -79,6 +79,10 @@ private static JarResource createJarResource(String jarPath, String entryPath, b
         return null;
     }
 
+    public static boolean removeJarResource(String jarPath){
+        return jarCache.remove(jarPath);
+    }
+
     private final String jarPrefix;
     private final JarFileStat fileStat;