Fixing NPE in MemoryLeakUtil

openmrs · Feb 14, 2014 · b527b96 · b527b96
1 parent 8d24054
commit b527b96
Showing 1 changed file with 12 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
@@ -69,11 +69,23 @@ public static void shutdownMysqlCancellationTimer() {
 	public static void shutdownKeepAliveTimer() {
 		try {
 			final Field kac = HttpClient.class.getDeclaredField("kac");
+			if (kac == null) {
+				return;
+			}
+
 			kac.setAccessible(true);
 			final Field keepAliveTimer = KeepAliveCache.class.getDeclaredField("keepAliveTimer");
+			if (keepAliveTimer == null) {
+				return;
+			}
+
 			keepAliveTimer.setAccessible(true);
 
 			final Thread thread = (Thread) keepAliveTimer.get(kac.get(null));
+			if (thread == null) {
+				return;
+			}
+
 			if (thread.getContextClassLoader() == OpenmrsClassLoader.getInstance()) {
 				//Set to system class loader such that we can be garbage collected.
 				thread.setContextClassLoader(ClassLoader.getSystemClassLoader());