HHH-8363 Some more mem leak fixes

Author: ctomc

hibernate-core/src/main/java/org/hibernate/boot/registry/classloading/internal/ClassLoaderServiceImpl.java

@@ -52,7 +52,7 @@
 public class ClassLoaderServiceImpl implements ClassLoaderService {
 	private static final Logger log = Logger.getLogger( ClassLoaderServiceImpl.class );
 
-	private final AggregatedClassLoader aggregatedClassLoader;
+	private AggregatedClassLoader aggregatedClassLoader;
 
 	private final Map<Class, ServiceLoader> serviceLoaders = new HashMap<Class, ServiceLoader>();
 
@@ -172,7 +172,7 @@ private static ClassLoader locateTCCL() {
 	}
 
 	private static class AggregatedClassLoader extends ClassLoader {
-		private final ClassLoader[] individualClassLoaders;
+		private ClassLoader[] individualClassLoaders;
 
 		private AggregatedClassLoader(final LinkedHashSet<ClassLoader> orderedClassLoaderSet) {
 			super( null );
@@ -227,7 +227,11 @@ protected Class<?> findClass(String name) throws ClassNotFoundException {
 
 			throw new ClassNotFoundException( "Could not load requested class : " + name );
 		}
-	}
+
+        public void destroy() {
+            individualClassLoaders = null;
+        }
+    }
 
 	@Override
 	@SuppressWarnings( {"unchecked"})
@@ -343,6 +347,10 @@ public void stop() {
 			serviceLoader.reload(); // clear service loader providers
 		}
 		serviceLoaders.clear();
+        if (aggregatedClassLoader!=null){
+            aggregatedClassLoader.destroy();
+            aggregatedClassLoader = null;
+        }
     }
 
 	// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java

@@ -278,8 +278,10 @@ public void destroy() {
 			serviceBindingList.clear();
 		}
 		serviceBindingMap.clear();
-		
-		parent.destroy();
+
+        if (parent!=null){
+    		parent.destroy();
+        }
 	}
 
 	@Override

hibernate-envers/src/main/java/org/hibernate/envers/configuration/spi/AuditConfiguration.java

@@ -23,6 +23,7 @@
  */
 package org.hibernate.envers.configuration.spi;
 
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Properties;
 import java.util.WeakHashMap;
@@ -62,7 +63,7 @@ public class AuditConfiguration {
 	private final RevisionInfoQueryCreator revisionInfoQueryCreator;
 	private final RevisionInfoNumberReader revisionInfoNumberReader;
 	private final ModifiedEntityNamesReader modifiedEntityNamesReader;
-	private final ClassLoaderService classLoaderService;
+	private ClassLoaderService classLoaderService;
 
 	public AuditEntitiesConfiguration getAuditEntCfg() {
 		return auditEntCfg;
@@ -184,4 +185,13 @@ public synchronized static AuditConfiguration getFor(Configuration cfg, ClassLoa
 
 		return verCfg;
 	}
+
+    public void destroy() {
+        for (Map.Entry<Configuration, AuditConfiguration> c: new HashSet<Map.Entry<Configuration, AuditConfiguration>>(CFGS.entrySet())){
+            if (c.getValue() == this){//this is nasty cleanup fix, whole static CFGS should be reworked
+                CFGS.remove(c.getKey());
+            }
+        }
+        classLoaderService = null;
+    }
 }

hibernate-envers/src/main/java/org/hibernate/envers/event/spi/EnversIntegrator.java

@@ -53,6 +53,7 @@ public class EnversIntegrator implements Integrator {
 	 * should happen or not.  Default is true
 	 */
 	public static final String AUTO_REGISTER = "hibernate.listeners.envers.autoRegister";
+    private AuditConfiguration enversConfiguration;
 
 	@Override
 	public void integrate(
@@ -72,7 +73,7 @@ public void integrate(
 		final EventListenerRegistry listenerRegistry = serviceRegistry.getService( EventListenerRegistry.class );
 		listenerRegistry.addDuplicationStrategy( EnversListenerDuplicationStrategy.INSTANCE );
 
-		final AuditConfiguration enversConfiguration = AuditConfiguration.getFor(
+        enversConfiguration = AuditConfiguration.getFor(
 				configuration,
 				serviceRegistry.getService(
 						ClassLoaderService.class
@@ -112,7 +113,7 @@ EventType.POST_UPDATE, new EnversPostUpdateEventListenerImpl(
 
 	@Override
 	public void disintegrate(SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) {
-		// nothing to do afaik
+        enversConfiguration.destroy();
 	}
 
 	/**