Merge pull request #7252 from jmesnil/WFLY-4423_CNFE_JMS_Bridge_stop_…

…start
wildfly · Mar 16, 2015 · f5c7cb3 · f5c7cb3
2 parents bdaa0b8 + adfa4c5
commit f5c7cb3
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/messaging/src/main/java/org/jboss/as/messaging/jms/bridge/JMSBridgeService.java b/messaging/src/main/java/org/jboss/as/messaging/jms/bridge/JMSBridgeService.java
@@ -93,18 +93,20 @@ public void run() {
     }
 
     public void startBridge() throws Exception {
-        if (moduleName == null) {
-            bridge.start();
+        final Module module;
+        if (moduleName != null) {
+            ModuleIdentifier moduleID = ModuleIdentifier.create(moduleName);
+            module =  Module.getContextModuleLoader().loadModule(moduleID);
         } else {
-            ClassLoader oldTccl= WildFlySecurityManager.getCurrentContextClassLoaderPrivileged();
-            try {
-                ModuleIdentifier moduleID = ModuleIdentifier.create(moduleName);
-                Module module = Module.getCallerModuleLoader().loadModule(moduleID);
-                WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(module.getClassLoader());
-                bridge.start();
-            } finally {
-                WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(oldTccl);
-            }
+            module = Module.forClass(JMSBridgeService.class);
+        }
+
+        ClassLoader oldTccl= WildFlySecurityManager.getCurrentContextClassLoaderPrivileged();
+        try {
+            WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(module.getClassLoader());
+            bridge.start();
+        } finally {
+            WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(oldTccl);
         }
         MessagingLogger.MESSAGING_LOGGER.startedService("JMS Bridge", bridgeName);
     }