TRUNK-3738 Fixed stopping module

openmrs · Aug 20, 2013 · 67c9f03 · 67c9f03
1 parent fd7cffc
commit 67c9f03
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/api/src/main/java/org/openmrs/module/ModuleUtil.java b/api/src/main/java/org/openmrs/module/ModuleUtil.java
@@ -750,7 +750,8 @@ public static AbstractRefreshableApplicationContext refreshApplicationContext(Ab
 	public static AbstractRefreshableApplicationContext refreshApplicationContext(AbstractRefreshableApplicationContext ctx,
 	        boolean isOpenmrsStartup, Module startedModule) {
 		//notify all started modules that we are about to refresh the context
-		for (Module module : ModuleFactory.getStartedModules()) {
+		Set<Module> startedModules = new HashSet<Module>(ModuleFactory.getStartedModules());
+		for (Module module : startedModules) {
 			try {
 				if (module.getModuleActivator() != null)
 					module.getModuleActivator().willRefreshContext();
@@ -791,16 +792,19 @@ public static AbstractRefreshableApplicationContext refreshApplicationContext(Ab
 
 		// reload the advice points that were lost when refreshing Spring
 		if (log.isDebugEnabled())
-			log.debug("Reloading advice for all started modules: " + ModuleFactory.getStartedModules().size());
+			log.debug("Reloading advice for all started modules: " + startedModules.size());
 
 		try {
 			//The call backs in this block may need lazy loading of objects
 			//which will fail because we use an OpenSessionInViewFilter whose opened session
 			//was closed when the application context was refreshed as above.
 			//So we need to open another session now. TRUNK-3739
 			Context.openSessionWithCurrentUser();
-
-			for (Module module : ModuleFactory.getStartedModules()) {
+			for (Module module : startedModules) {
+				if (!module.isStarted()) {
+					continue;
+				}
+
 				ModuleFactory.loadAdvice(module);
 				try {
 					ModuleFactory.passDaemonToken(module);
@@ -817,7 +821,7 @@ else if (!isOpenmrsStartup && module.equals(startedModule))
 						}
 						catch (Exception e) {
 							log.warn("Unable to invoke started() method on the module's activator", e);
-							ModuleFactory.stopModule(module);
+							ModuleFactory.stopModule(module, true, true);
 						}
 					}