Clearing hibernate session factories that leak memory on spring refresh:

Investigate possible memory leak in 1.9.0 or one of its bundled modules. - TRUNK-3440
openmrs · Apr 30, 2013 · ffc9294 · ffc9294
1 parent af6addf
commit ffc9294
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/api/src/main/java/org/openmrs/util/MemoryLeakUtil.java b/api/src/main/java/org/openmrs/util/MemoryLeakUtil.java
@@ -14,10 +14,12 @@
 package org.openmrs.util;
 
 import java.lang.reflect.Field;
+import java.util.Map;
 import java.util.Timer;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.hibernate.impl.SessionFactoryObjectFactory;
 
 import sun.net.www.http.HttpClient;
 import sun.net.www.http.KeepAliveCache;
@@ -81,4 +83,24 @@ public static void shutdownKeepAliveTimer() {
 			log.error(e.getMessage(), e);
 		}
 	}
+
+	/**
+	 * Clears the hibernate session factories cached in the SessionFactoryObjectFactory
+	 */
+	public static void clearHibernateSessionFactories() {
+		try {
+			Field field = SessionFactoryObjectFactory.class.getDeclaredField("INSTANCES");
+			field.setAccessible(true);
+			Map instances = (Map) field.get(null);
+			instances.clear();
+
+			field = SessionFactoryObjectFactory.class.getDeclaredField("NAMED_INSTANCES");
+			field.setAccessible(true);
+			Map namedInstances = (Map) field.get(null);
+			namedInstances.clear();
+		}
+		catch (Exception ex) {
+			log.error(ex.getMessage(), ex);
+		}
+	}
 }
diff --git a/api/src/main/java/org/openmrs/util/OpenmrsClassLoader.java b/api/src/main/java/org/openmrs/util/OpenmrsClassLoader.java
@@ -323,6 +323,8 @@ public static void destroyInstance() {
 				log.error(ex.getMessage(), ex);
 			}
 		}
+
+		MemoryLeakUtil.clearHibernateSessionFactories();
 
 		OpenmrsClassScanner.destroyInstance();