Merge pull request #9787 from ctomc/prepare-cap-api

WFLY-8351 - prepare code for WFCORE-2202
wildfly · Mar 13, 2017 · 9245037 · 9245037
2 parents 67c0369 + 9e9f446
commit 9245037
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/clustering/common/src/main/java/org/jboss/as/clustering/controller/AddStepHandler.java b/clustering/common/src/main/java/org/jboss/as/clustering/controller/AddStepHandler.java
@@ -189,7 +189,7 @@ protected void recordCapabilitiesAndRequirements(OperationContext context, Model
                     .filter(AttributeDefinition::hasCapabilityRequirements)
                     .forEach(attribute -> attribute.addCapabilityRequirements(context, model.get(attribute.getName())));
 
-        this.descriptor.getResourceCapabilityReferences().forEach((reference, resolver) -> reference.addCapabilityRequirements(context, null, resolver.apply(address)));
+        this.descriptor.getResourceCapabilityReferences().forEach((reference, resolver) -> reference.addCapabilityRequirements(context, (String)null, resolver.apply(address)));
     }
 
     @Override

diff --git a/clustering/common/src/main/java/org/jboss/as/clustering/controller/RemoveStepHandler.java b/clustering/common/src/main/java/org/jboss/as/clustering/controller/RemoveStepHandler.java
@@ -87,7 +87,7 @@ protected void performRemove(OperationContext context, ModelNode operation, Mode
                         .filter(AttributeDefinition::hasCapabilityRequirements)
                         .forEach(attribute -> attribute.removeCapabilityRequirements(context, model.get(attribute.getName())));
 
-            this.descriptor.getResourceCapabilityReferences().forEach((reference, resolver) -> reference.removeCapabilityRequirements(context, null, resolver.apply(address)));
+            this.descriptor.getResourceCapabilityReferences().forEach((reference, resolver) -> reference.removeCapabilityRequirements(context, (String)null, resolver.apply(address)));
 
             // Remove any runtime child resources
             removeRuntimeChildren(context, PathAddress.EMPTY_ADDRESS);