Remove handler should ignore runtime attributes when removing capabil…

…ity references, since these are not present in the model.

Aliases can also be ignored as these are constrainted by the target attribute.

controller/src/main/java/org/jboss/as/controller/AbstractRemoveStepHandler.java

@@ -50,6 +50,7 @@ public abstract class AbstractRemoveStepHandler implements OperationStepHandler
     protected AbstractRemoveStepHandler() {
     }
 
+    @Override
     public void execute(OperationContext context, ModelNode operation) throws OperationFailedException {
 
         Resource resource = context.readResource(PathAddress.EMPTY_ADDRESS);
@@ -66,6 +67,7 @@ public void execute(OperationContext context, ModelNode operation) throws Operat
 
             if (requiresRuntime(context)) {
                 context.addStep(new OperationStepHandler() {
+                    @Override
                     public void execute(OperationContext context, ModelNode operation) throws OperationFailedException {
                         performRuntime(context, operation, model);
 
@@ -170,28 +172,27 @@ protected void performRemove(OperationContext context, final ModelNode operation
      *                 is invoked before that method is. Will not be {@code null}
      */
     protected void recordCapabilitiesAndRequirements(OperationContext context, ModelNode operation, Resource resource) throws OperationFailedException {
-        Set<RuntimeCapability> capabilitySet = context.getResourceRegistration().getCapabilities();
-
-        for (RuntimeCapability capability : capabilitySet) {
+        ImmutableManagementResourceRegistration registration = context.getResourceRegistration();
+        for (RuntimeCapability<?> capability : registration.getCapabilities()) {
             if (capability.isDynamicallyNamed()) {
                 context.deregisterCapability(capability.getDynamicName(context.getCurrentAddress()));
             } else {
                 context.deregisterCapability(capability.getName());
             }
         }
         ModelNode model = resource.getModel();
-        ImmutableManagementResourceRegistration mrr = context.getResourceRegistration();
-        for (String attr : mrr.getAttributeNames(PathAddress.EMPTY_ADDRESS)) {
-            AttributeAccess aa = mrr.getAttributeAccess(PathAddress.EMPTY_ADDRESS, attr);
-            if (aa != null) {
-                AttributeDefinition ad = aa.getAttributeDefinition();
-                if (ad != null && (model.hasDefined(ad.getName()) || ad.hasCapabilityRequirements())) {
-                    ad.removeCapabilityRequirements(context, resource, model.get(ad.getName()));
-                }
+        for (AttributeAccess attribute : registration.getAttributes(PathAddress.EMPTY_ADDRESS).values()) {
+            // Skip runtime attributes and aliases
+            if (AttributeAccess.Storage.RUNTIME.test(attribute) || AttributeAccess.Flag.ALIAS.test(attribute)) continue;
+
+            AttributeDefinition definition = attribute.getAttributeDefinition();
+            String attributeName = definition.getName();
+            if (model.hasDefined(attributeName) || definition.hasCapabilityRequirements()) {
+                definition.removeCapabilityRequirements(context, resource, model.get(attributeName));
             }
         }
-        assert mrr.getRequirements() != null;
-        for (CapabilityReferenceRecorder recorder : mrr.getRequirements()) {
+        assert registration.getRequirements() != null;
+        for (CapabilityReferenceRecorder recorder : registration.getRequirements()) {
             recorder.removeCapabilityRequirements(context, resource, null);
         }
     }
@@ -227,7 +228,7 @@ protected boolean requiresRuntime(OperationContext context) {
         return context.isDefaultRequiresRuntime();
     }
 
-    private static boolean hasResource (OperationContext context) {
+    private static boolean hasResource(OperationContext context) {
         try {
             context.readResource(PathAddress.EMPTY_ADDRESS, false);
             return true;