Merge pull request #8877 from bstansberry/WFLY-6550

[WFLY-6550] Use fromString instead of create when the text may includ…
wildfly · Jun 2, 2016 · 8a513e1 · 8a513e1
2 parents eb97b1e + 324d11b
commit 8a513e1
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/connector/src/main/java/org/jboss/as/connector/subsystems/datasources/JdbcDriverRemove.java b/connector/src/main/java/org/jboss/as/connector/subsystems/datasources/JdbcDriverRemove.java
@@ -82,7 +82,7 @@ protected void recoverServices(OperationContext context, ModelNode operation, Mo
         final ModuleIdentifier moduleId;
         final Module module;
         try {
-            moduleId = ModuleIdentifier.create(moduleName);
+            moduleId = ModuleIdentifier.fromString(moduleName);
             module = Module.getCallerModuleLoader().loadModule(moduleId);
         } catch (ModuleLoadException e) {
             context.getFailureDescription().set(ConnectorLogger.ROOT_LOGGER.failedToLoadModuleDriver(moduleName));

diff --git a/messaging-activemq/src/main/java/org/wildfly/extension/messaging/activemq/ServerAdd.java b/messaging-activemq/src/main/java/org/wildfly/extension/messaging/activemq/ServerAdd.java
@@ -449,7 +449,7 @@ private List<Class> unwrapClasses(List<ModelNode> classesModel) throws Operation
             String className = classModel.get(NAME).asString();
             String moduleName = classModel.get(MODULE).asString();
             try {
-                ModuleIdentifier moduleID = ModuleIdentifier.create(moduleName);
+                ModuleIdentifier moduleID = ModuleIdentifier.fromString(moduleName);
                 Module module = Module.getCallerModuleLoader().loadModule(moduleID);
                 Class<?> clazz = module.getClassLoader().loadClass(className);
                 classes.add(clazz);

diff --git a/...ivemq/src/main/java/org/wildfly/extension/messaging/activemq/jms/bridge/JMSBridgeAdd.java b/...ivemq/src/main/java/org/wildfly/extension/messaging/activemq/jms/bridge/JMSBridgeAdd.java
@@ -152,7 +152,7 @@ private JMSBridge createJMSBridge(OperationContext context, ModelNode model) thr
             // if a module is specified, use it to instantiate the JMSBridge to ensure its ExecutorService
             // will use the correct class loader to execute its threads
             if (moduleName != null) {
-                ModuleIdentifier moduleID = ModuleIdentifier.create(moduleName);
+                ModuleIdentifier moduleID = ModuleIdentifier.fromString(moduleName);
                 Module module = Module.getCallerModuleLoader().loadModule(moduleID);
                 WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(module.getClassLoader());
             }

diff --git a/...q/src/main/java/org/wildfly/extension/messaging/activemq/jms/bridge/JMSBridgeService.java b/...q/src/main/java/org/wildfly/extension/messaging/activemq/jms/bridge/JMSBridgeService.java
@@ -93,7 +93,7 @@ public void run() {
     public void startBridge() throws Exception {
         final Module module;
         if (moduleName != null) {
-            ModuleIdentifier moduleID = ModuleIdentifier.create(moduleName);
+            ModuleIdentifier moduleID = ModuleIdentifier.fromString(moduleName);
             module =  Module.getContextModuleLoader().loadModule(moduleID);
         } else {
             module = Module.forClass(JMSBridgeService.class);

diff --git a/...main/java/org/wildfly/extension/picketlink/idm/config/JPAStoreSubsystemConfiguration.java b/...main/java/org/wildfly/extension/picketlink/idm/config/JPAStoreSubsystemConfiguration.java
@@ -64,7 +64,7 @@ public class JPAStoreSubsystemConfiguration extends JPAIdentityStoreConfiguratio
             ModuleLoader moduleLoader = Module.getBootModuleLoader();
 
             try {
-                this.entityModule = moduleLoader.loadModule(ModuleIdentifier.create(entityModuleName));
+                this.entityModule = moduleLoader.loadModule(ModuleIdentifier.fromString(entityModuleName));
             } catch (ModuleLoadException e) {
                 throw PicketLinkLogger.ROOT_LOGGER.idmJpaEntityModuleNotFound(entityModuleName);
             }

diff --git a/.../src/main/java/org/wildfly/extension/picketlink/idm/model/PartitionManagerAddHandler.java b/.../src/main/java/org/wildfly/extension/picketlink/idm/model/PartitionManagerAddHandler.java
@@ -460,7 +460,7 @@ private Module getModule(ModelNode moduleNode) {
         if (moduleNode.isDefined()) {
             ModuleLoader moduleLoader = Module.getBootModuleLoader();
             try {
-                module = moduleLoader.loadModule(ModuleIdentifier.create(moduleNode.asString()));
+                module = moduleLoader.loadModule(ModuleIdentifier.fromString(moduleNode.asString()));
             } catch (ModuleLoadException e) {
                 throw ROOT_LOGGER.moduleCouldNotLoad(moduleNode.asString(), e);
             }

diff --git a/...ger/src/main/java/org/wildfly/extension/security/manager/SecurityManagerSubsystemAdd.java b/...ger/src/main/java/org/wildfly/extension/security/manager/SecurityManagerSubsystemAdd.java
@@ -169,7 +169,7 @@ protected List<PermissionFactory> retrievePermissionSet(final OperationContext c
                 ClassLoader cl = WildFlySecurityManager.getClassLoaderPrivileged(this.getClass());
                 if(moduleName != null) {
                     try {
-                        cl = Module.getBootModuleLoader().loadModule(ModuleIdentifier.create(moduleName)).getClassLoader();
+                        cl = Module.getBootModuleLoader().loadModule(ModuleIdentifier.fromString(moduleName)).getClassLoader();
                     } catch (ModuleLoadException e) {
                         throw new OperationFailedException(e);
                     }

diff --git a/...n/java/org/wildfly/extension/undertow/deployment/UndertowHandlersDeploymentProcessor.java b/...n/java/org/wildfly/extension/undertow/deployment/UndertowHandlersDeploymentProcessor.java
@@ -87,7 +87,7 @@ private void handleJbossWebXml(DeploymentUnit deploymentUnit, Module module) thr
             try {
                 ClassLoader cl = module.getClassLoader();
                 if (hander.getModule() != null) {
-                    Module handlerModule = deploymentUnit.getAttachment(Attachments.SERVICE_MODULE_LOADER).loadModule(ModuleIdentifier.create(hander.getModule()));
+                    Module handlerModule = deploymentUnit.getAttachment(Attachments.SERVICE_MODULE_LOADER).loadModule(ModuleIdentifier.fromString(hander.getModule()));
                     cl = handlerModule.getClassLoader();
 
                 }