OpenMRS crashes irrecoverably if particular errors occur during module loading - TRUNK-2850

wluyima · dkayiwa · commit 466cd8b825f8 · 2013-05-31T13:35:04.000+03:00
(cherry picked from commit 860a84e)
diff --git a/web/src/main/java/org/openmrs/web/Listener.java b/web/src/main/java/org/openmrs/web/Listener.java
@@ -569,7 +569,12 @@ public static void performWebStartOfModules(ServletContext servletContext) throw
 				throw ex;
 			}
 			catch (Throwable t) {
-				log.fatal("Unable to refresh the spring application context. Unloading all modules,  Error was:", t);
+				Throwable rootCause = getActualRootCause(t, true);
+				if (rootCause != null)
+					log.fatal("Unable to refresh the spring application context.  Root Cause was:",  rootCause);
+				else
+					log.fatal("Unable to refresh the spring application context. Unloading all modules,  Error was:", t);
+				
 				try {
 					WebModuleUtil.shutdownModules(servletContext);
 					for (Module mod : ModuleFactory.getLoadedModules()) {// use loadedModules to avoid a concurrentmodificationexception
@@ -608,4 +613,22 @@ public static void performWebStartOfModules(ServletContext servletContext) throw
 		}
 	}
 	
+	/**
+	 * Convenience method that recursively attempts to pull the root case from a Throwable
+	 * 
+	 * @param t the Throwable object
+	 * @param isOriginalError specifies if the passed in Throwable is the original Exception that
+	 *            was thrown
+	 * @return the root cause if any was found
+	 */
+	private static Throwable getActualRootCause(Throwable t, boolean isOriginalError) {
+		if (t.getCause() != null)
+			return getActualRootCause(t.getCause(), false);
+		
+		if (!isOriginalError)
+			return t;
+		
+		return null;
+	}
+	
 }
