Merge pull request #8693 from soul2zimate/WFLY-6223

[WFLY-6223] compare with resolved current value.
wildfly · Jun 10, 2016 · c8f8ba4 · c8f8ba4
2 parents 8b9bcfb + 54a6802
commit c8f8ba4
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/...ntegration/src/main/java/org/jboss/as/webservices/dmr/WSServerConfigAttributeHandler.java b/...ntegration/src/main/java/org/jboss/as/webservices/dmr/WSServerConfigAttributeHandler.java
@@ -57,7 +57,7 @@ protected boolean applyUpdateToRuntime(OperationContext context, ModelNode opera
 
         //if the server is booting or the required value is the current one,
         //we do not need to do anything and reload is not required
-        if (isSameValue(resolvedValue, currentValue, attributeName) || context.isBooting()) {
+        if (isSameValue(context, resolvedValue, currentValue, attributeName) || context.isBooting()) {
             return false;
         }
 
@@ -67,8 +67,9 @@ protected boolean applyUpdateToRuntime(OperationContext context, ModelNode opera
         return !done; //reload required if runtime has not been updated
     }
 
-    private boolean isSameValue(ModelNode resolvedValue, ModelNode currentValue, String attributeName) {
-        if (resolvedValue.equals(currentValue)) {
+    private boolean isSameValue(OperationContext context, ModelNode resolvedValue, ModelNode currentValue, String attributeName)
+            throws OperationFailedException {
+        if (resolvedValue.equals(getAttributeDefinition(attributeName).resolveValue(context, currentValue))) {
             return true;
         }
         if (!currentValue.isDefined()) {