AS7-6103, use findLoadedModuleLocal() to retrieve module to be unloaded.

soul2zimate · bstansberry · commit 702d855fae71 · 2012-12-18T12:12:41.000-06:00
diff --git a/server/src/main/java/org/jboss/as/server/moduleservice/ServiceModuleLoader.java b/server/src/main/java/org/jboss/as/server/moduleservice/ServiceModuleLoader.java
@@ -100,13 +100,10 @@ public void transition(final ServiceController<? extends ModuleSpec> controller,
                 case STOP_REQUESTED_to_STOPPING: {
                     log.tracef("serviceStopping: %s", controller);
                     ModuleSpec moduleSpec = this.moduleSpec;
-                    try {
-                        Module module = loadModule(moduleSpec.getModuleIdentifier());
+                    ModuleIdentifier identifier = moduleSpec.getModuleIdentifier();
+                    Module module = findLoadedModuleLocal(identifier);
+                    if(module != null)
                         unloadModuleLocal(module);
-                    } catch (ModuleLoadException e) {
-                        // ignore, the module should always be already loaded by this point,
-                        // and if not we will only mask the true problem
-                    }
                     // TODO: what if the service is restarted?
                     controller.removeListener(this);
                     break;
