[WFLY-9176] Don't clone the entire resource tree to check for the pre…

…sence of another subsystem resource TODO Why not use capabilities for this?
wildfly · Aug 5, 2017 · 13fef10 · 13fef10 · pferraro · Aug 18, 2017
1 parent 4d34cb7
commit 13fef10
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/.../main/java/org/jboss/as/clustering/infinispan/subsystem/CacheContainerServiceHandler.java b/.../main/java/org/jboss/as/clustering/infinispan/subsystem/CacheContainerServiceHandler.java
@@ -67,9 +67,9 @@ public void installServices(OperationContext context, ModelNode model) throws Op
         // Handle case where ejb subsystem has already installed services for this cache-container
         // This can happen if the ejb cache-container is added to a running server
         if (context.getProcessType().isServer() && !context.isBooting() && name.equals("ejb")) {
-            Resource rootResource = context.readResourceFromRoot(PathAddress.EMPTY_ADDRESS);
             PathElement ejbPath = PathElement.pathElement(ModelDescriptionConstants.SUBSYSTEM, "ejb3");
-            if (rootResource.hasChild(ejbPath) && rootResource.getChild(ejbPath).hasChild(PathElement.pathElement("service", "remote"))) {
+            Resource ejbResource = safeGetResource(context, ejbPath);
+            if (ejbResource != null && ejbResource.hasChild(PathElement.pathElement("service", "remote"))) {
                 // Following restart, these services will be installed by this handler, rather than the ejb remote handler
                 context.addStep(new OperationStepHandler() {
                     @Override
@@ -139,4 +139,13 @@ public void removeServices(OperationContext context, ModelNode model) throws Ope
 
         EnumSet.allOf(CacheContainerResourceDefinition.Capability.class).stream().map(component -> component.getServiceName(address)).forEach(serviceName -> context.removeService(serviceName));
     }
+
+    private static Resource safeGetResource(OperationContext context, PathElement path) {
+        try {
+            return context.readResourceFromRoot(PathAddress.pathAddress(path), false);
+        } catch (RuntimeException e) {
+            // No such resource
+            return null;
+        }
+    }
 }
diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3RemoteServiceAdd.java b/ejb3/src/main/java/org/jboss/as/ejb3/subsystem/EJB3RemoteServiceAdd.java
@@ -92,9 +92,9 @@ void installRuntimeServices(final OperationContext context, final ModelNode mode
         new ClientMappingsRegistryBuilder(clientMappingsClusterName).configure(context).build(target).setInitialMode(ServiceController.Mode.ON_DEMAND).install();
 
         // Handle case where no infinispan subsystem exists or does not define an ejb cache-container
-        Resource rootResource = context.readResourceFromRoot(PathAddress.EMPTY_ADDRESS);
         PathElement infinispanPath = PathElement.pathElement(ModelDescriptionConstants.SUBSYSTEM, "infinispan");
-        if (!rootResource.hasChild(infinispanPath) || !rootResource.getChild(infinispanPath).hasChild(PathElement.pathElement("cache-container", clientMappingsClusterName))) {
+        Resource infinispanResource = safeGetResource(context, infinispanPath);
+        if (infinispanResource == null || !infinispanResource.hasChild(PathElement.pathElement("cache-container", clientMappingsClusterName))) {
             // Install services that would normally be installed by this container/cache
             CapabilityServiceSupport support = context.getCapabilityServiceSupport();
             for (GroupBuilderProvider provider : ServiceLoader.load(LocalGroupBuilderProvider.class, LocalGroupBuilderProvider.class.getClassLoader())) {
@@ -167,4 +167,13 @@ private String getClassNameForChannelOptionType(final String optionType) {
         }
         throw EjbLogger.ROOT_LOGGER.unknownChannelCreationOptionType(optionType);
     }
+
+    private static Resource safeGetResource(OperationContext context, PathElement path) {
+        try {
+            return context.readResourceFromRoot(PathAddress.pathAddress(path), false);
+        } catch (RuntimeException e) {
+            // No such resource
+            return null;
+        }
+    }
 }