LDEV-5903 fix PageSourcePool leak when PhysicalClassLoader flushes

Author: zspitzer

core/src/main/java/lucee/commons/lang/PhysicalClassLoader.java

@@ -24,8 +24,10 @@
 import java.lang.instrument.UnmodifiableClassException;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 import lucee.commons.digest.HashUtil;
@@ -80,19 +82,25 @@ public static void resetLastFlushPagesCleared() {
 	private Map<String, Integer> allLoadedClasses = new ConcurrentHashMap<>(); // this includes all renames
 	private Map<String, String> unavaiClasses = new ConcurrentHashMap<>();
 
-	private PageSourcePool pageSourcePool;
+	private final Set<PageSourcePool> pageSourcePools = Collections.newSetFromMap(new ConcurrentHashMap<>());
+
+	public void registerPageSourcePool( PageSourcePool pool ) {
+		if ( pool != null ) {
+			pageSourcePools.add( pool );
+		}
+	}
 
 	private boolean rpc;
 
 	private String birthplace;
 
 	public final String id;
 
-	PhysicalClassLoader(Config c, List<Resource> resources, Resource directory, ClassLoader parentClassLoader, ClassLoader addionalClassLoader, PageSourcePool pageSourcePool,
+	PhysicalClassLoader(Config c, List<Resource> resources, Resource directory, ClassLoader parentClassLoader, ClassLoader addionalClassLoader,
 			boolean rpc) throws IOException {
 
 		this(c, PhysicalClassLoaderFactory.doURLs(resources), resources, directory,
-				parentClassLoader == null ? (parentClassLoader = SystemUtil.getCombinedClassLoader()) : parentClassLoader, addionalClassLoader, pageSourcePool, rpc);
+				parentClassLoader == null ? (parentClassLoader = SystemUtil.getCombinedClassLoader()) : parentClassLoader, addionalClassLoader, rpc);
 
 		// check directory
 		if (!directory.exists()) directory.mkdirs();
@@ -101,13 +109,12 @@ public static void resetLastFlushPagesCleared() {
 	}
 
 	private PhysicalClassLoader(Config c, URL[] urls, List<Resource> resources, Resource directory, ClassLoader parentClassLoader, ClassLoader addionalClassLoader,
-			PageSourcePool pageSourcePool, boolean rpc) {
+			boolean rpc) {
 		super(urls, parentClassLoader == null ? (parentClassLoader = SystemUtil.getCombinedClassLoader()) : parentClassLoader);
 		this.resources = resources;
 		config = (ConfigPro) c;
 		this.addionalClassLoader = addionalClassLoader;
 		this.birthplace = ExceptionUtil.getStacktrace(new Throwable(), false);
-		this.pageSourcePool = pageSourcePool;
 
 		this.directory = directory;
 		this.rpc = rpc;
@@ -123,10 +130,15 @@ private PhysicalClassLoader(Config c, URL[] urls, List<Resource> resources, Reso
 	}
 
 	public static PhysicalClassLoader flush(PhysicalClassLoader existing, Config config) {
-		int pagesCleared = existing.pageSourcePool != null ? existing.pageSourcePool.clearPages(existing) : 0;
+		int pagesCleared = 0;
+		for (PageSourcePool pool : existing.pageSourcePools) {
+			pagesCleared += pool.clearPages(existing);
+		}
 		lastFlushPagesCleared = pagesCleared;
 		PhysicalClassLoader clone = new PhysicalClassLoader(config, existing.getURLs(), existing.resources, existing.directory, existing.getParent(), existing.addionalClassLoader,
-				null, existing.rpc);
+				existing.rpc);
+		// copy registered pools to the new classloader
+		clone.pageSourcePools.addAll(existing.pageSourcePools);
 		DynamicInvoker instance = DynamicInvoker.getExistingInstance();
 		int count = 0;
 		if (instance != null) count += instance.remove(existing);
@@ -454,7 +466,11 @@ private void clear() {
 	}
 
 	private void clear(boolean clearPagePool) {
-		if (clearPagePool && pageSourcePool != null) pageSourcePool.clearPages(this);
+		if (clearPagePool) {
+			for (PageSourcePool pool : pageSourcePools) {
+				pool.clearPages(this);
+			}
+		}
 		this.loadedClasses.clear();
 		this.allLoadedClasses.clear();
 		this.unavaiClasses.clear();

core/src/main/java/lucee/commons/lang/PhysicalClassLoaderFactory.java

@@ -54,7 +54,7 @@ public static PhysicalClassLoader getPhysicalClassLoader(Config c, Resource dire
 						PhysicalClassLoader existing = classLoaders.get(key);
 						if (existing != null) PhysicalClassLoader.flush(existing, c);
 					}
-					classLoaders.put(key, rpccl = new PhysicalClassLoader(c, new ArrayList<Resource>(), directory, SystemUtil.getCombinedClassLoader(), null, null, false));
+					classLoaders.put(key, rpccl = new PhysicalClassLoader(c, new ArrayList<Resource>(), directory, SystemUtil.getCombinedClassLoader(), null, false));
 					return rpccl;
 				}
 			}
@@ -93,8 +93,7 @@ public static PhysicalClassLoader getRPCClassLoader(Config c, JavaSettings js, b
 						resources = toSortedList(((JavaSettingsImpl) js).getAllResources());
 					}
 					Resource dir = storeResourceMeta(c, key, js, resources);
-					// (Config config, String key, JavaSettings js, Collection<Resource> _resources)
-					classLoaders.put(key, rpccl = new PhysicalClassLoader(c, resources, dir, parent != null ? parent : SystemUtil.getCombinedClassLoader(), null, null, true));
+					classLoaders.put(key, rpccl = new PhysicalClassLoader(c, resources, dir, parent != null ? parent : SystemUtil.getCombinedClassLoader(), null, true));
 					return rpccl;
 				}
 			}
@@ -122,8 +121,7 @@ public static PhysicalClassLoader getRPCClassLoader(Config c, BundleClassLoader
 					}
 					Resource dir = c.getClassDirectory().getRealResource("RPC/" + key);
 					if (!dir.exists()) ResourceUtil.createDirectoryEL(dir, true);
-					// (Config config, String key, JavaSettings js, Collection<Resource> _resources)
-					classLoaders.put(key, rpccl = new PhysicalClassLoader(c, new ArrayList<Resource>(), dir, SystemUtil.getCombinedClassLoader(), bcl, null, true));
+					classLoaders.put(key, rpccl = new PhysicalClassLoader(c, new ArrayList<Resource>(), dir, SystemUtil.getCombinedClassLoader(), bcl, true));
 					return rpccl;
 				}
 			}

core/src/main/java/lucee/runtime/MappingImpl.java

@@ -266,6 +266,7 @@ public Class<?> loadClass(String className) {
 
 	private Class<?> loadClass(String className, byte[] code) throws IOException, ClassNotFoundException {
 		PhysicalClassLoader pcl = PhysicalClassLoaderFactory.getPhysicalClassLoader(config, getClassRootDirectory(), false);
+		pcl.registerPageSourcePool( pageSourcePool );
 		/*
 		 * PhysicalClassLoaderReference pclr = loaders.get(className); PhysicalClassLoader pcl = pclr ==
 		 * null ? null : pclr.get(); if (pcl == null || code != null) {// || pcl.getSize(true) > 3 if (pcl
@@ -280,6 +281,7 @@ private Class<?> loadClass(String className, byte[] code) throws IOException, Cl
 			}
 			catch (UnmodifiableClassException e) {
 				pcl = PhysicalClassLoaderFactory.getPhysicalClassLoader(config, getClassRootDirectory(), true);
+				pcl.registerPageSourcePool( pageSourcePool );
 				try {
 					return pcl.loadClass(className, code);
 				}