Close classloader on release

gradle · Aug 24, 2019 · 3c69c4c · 3c69c4c
1 parent 07e3e0d
commit 3c69c4c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/...main/java/org/gradle/api/internal/initialization/loadercache/DefaultClassLoaderCache.java b/...main/java/org/gradle/api/internal/initialization/loadercache/DefaultClassLoaderCache.java
@@ -46,6 +46,7 @@ public class DefaultClassLoaderCache implements ClassLoaderCacheInternal, Stoppa
     private final Map<ClassLoaderId, CachedClassLoader> byId = Maps.newHashMap();
     private final Map<ClassLoaderSpec, CachedClassLoader> bySpec = Maps.newHashMap();
     private final Set<ClassLoaderId> usedInThisBuild = Sets.newHashSet();
+    private final Set<CachedClassLoader> released = Sets.newHashSet();
     private final ClasspathHasher classpathHasher;
     private final HashingClassLoaderFactory classLoaderFactory;
 
@@ -75,6 +76,7 @@ public ClassLoader get(ClassLoaderId id, ClassPath classPath, @Nullable ClassLoa
 
                 if (cachedLoader != null) {
                     LOGGER.debug("Releasing previous classloader for {}", id);
+                    released.add(cachedLoader);
                     cachedLoader.release(id);
                 }
                 return newLoader.classLoader;
@@ -140,6 +142,9 @@ public void stop() {
             for (CachedClassLoader cachedClassLoader : byId.values()) {
                 ClassLoaderUtils.tryClose(cachedClassLoader.classLoader);
             }
+            for (CachedClassLoader cachedClassLoader : released) {
+                ClassLoaderUtils.tryClose(cachedClassLoader.classLoader);
+            }
             byId.clear();
             bySpec.clear();
             usedInThisBuild.clear();