[WFCORE-914] Make the activemq server r/o runtime attributes nillable…

…, and return undefined if we are admin-only
wildfly · Aug 26, 2015 · fb1eb35 · fb1eb35
1 parent 9a63994
commit fb1eb35
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/.../src/main/java/org/wildfly/extension/messaging/activemq/ActiveMQServerControlHandler.java b/.../src/main/java/org/wildfly/extension/messaging/activemq/ActiveMQServerControlHandler.java
@@ -25,16 +25,16 @@
 import static org.jboss.as.controller.SimpleAttributeDefinitionBuilder.create;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.READ_ATTRIBUTE_OPERATION;
+import static org.jboss.dmr.ModelType.BOOLEAN;
+import static org.jboss.dmr.ModelType.LIST;
+import static org.jboss.dmr.ModelType.STRING;
 import static org.wildfly.extension.messaging.activemq.ActiveMQActivationService.rollbackOperationIfServerNotActive;
 import static org.wildfly.extension.messaging.activemq.ManagementUtil.reportListOfStrings;
 import static org.wildfly.extension.messaging.activemq.ManagementUtil.reportRoles;
 import static org.wildfly.extension.messaging.activemq.ManagementUtil.reportRolesAsJSON;
 import static org.wildfly.extension.messaging.activemq.OperationDefinitionHelper.createNonEmptyStringAttribute;
 import static org.wildfly.extension.messaging.activemq.OperationDefinitionHelper.runtimeOnlyOperation;
 import static org.wildfly.extension.messaging.activemq.OperationDefinitionHelper.runtimeReadOnlyOperation;
-import static org.jboss.dmr.ModelType.BOOLEAN;
-import static org.jboss.dmr.ModelType.LIST;
-import static org.jboss.dmr.ModelType.STRING;
 
 import org.apache.activemq.artemis.api.core.management.ActiveMQServerControl;
 import org.apache.activemq.artemis.core.server.ActiveMQServer;
@@ -43,18 +43,19 @@
 import org.jboss.as.controller.OperationContext;
 import org.jboss.as.controller.OperationFailedException;
 import org.jboss.as.controller.PathAddress;
+import org.jboss.as.controller.RunningMode;
 import org.jboss.as.controller.SimpleAttributeDefinition;
 import org.jboss.as.controller.SimpleAttributeDefinitionBuilder;
 import org.jboss.as.controller.descriptions.ModelDescriptionConstants;
 import org.jboss.as.controller.descriptions.ResourceDescriptionResolver;
 import org.jboss.as.controller.operations.validation.StringLengthValidator;
 import org.jboss.as.controller.registry.AttributeAccess;
 import org.jboss.as.controller.registry.ManagementResourceRegistration;
-import org.wildfly.extension.messaging.activemq.logging.MessagingLogger;
 import org.jboss.dmr.ModelNode;
 import org.jboss.dmr.ModelType;
 import org.jboss.msc.service.ServiceController;
 import org.jboss.msc.service.ServiceName;
+import org.wildfly.extension.messaging.activemq.logging.MessagingLogger;
 
 /**
  * Handles operations and attribute reads supported by a ActiveMQ {@link org.apache.activemq.api.core.management.ActiveMQServerControl}.
@@ -121,14 +122,16 @@ protected void executeRuntimeStep(OperationContext context, ModelNode operation)
         final String operationName = operation.require(OP).asString();
 
         final ServiceName serviceName = MessagingServices.getActiveMQServiceName(PathAddress.pathAddress(operation.get(ModelDescriptionConstants.OP_ADDR)));
-        ServiceController<?> service = context.getServiceRegistry(false).getService(serviceName);
-        if (service == null || service.getState() != ServiceController.State.UP) {
-            throw MessagingLogger.ROOT_LOGGER.activeMQServerNotInstalled(serviceName.getSimpleName());
-        }
-        ActiveMQServer server = ActiveMQServer.class.cast(service.getValue());
 
         if (READ_ATTRIBUTE_OPERATION.equals(operationName)) {
-            handleReadAttribute(context, operation, server);
+            if (context.getRunningMode() == RunningMode.NORMAL) {
+                ServiceController<?> service = context.getServiceRegistry(false).getService(serviceName);
+                if (service == null || service.getState() != ServiceController.State.UP) {
+                    throw MessagingLogger.ROOT_LOGGER.activeMQServerNotInstalled(serviceName.getSimpleName());
+                }
+                ActiveMQServer server = ActiveMQServer.class.cast(service.getValue());
+                handleReadAttribute(context, operation, server);
+            }
             return;
         }