[WFLY-4715] Use default value for comparison when currentValue is und…

…efined
wildfly · Jun 1, 2015 · 85ea9d9 · 85ea9d9
1 parent b3fae18
commit 85ea9d9
Showing 1 changed file with 11 additions and 1 deletion.
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 (resolvedValue.equals(currentValue) || context.isBooting()) {
+        if (isSameValue(resolvedValue, currentValue, attributeName) || context.isBooting()) {
             return false;
         }
 
@@ -67,6 +67,16 @@ 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)) {
+            return true;
+        }
+        if (!currentValue.isDefined()) {
+            return resolvedValue.equals(getAttributeDefinition(attributeName).getDefaultValue());
+        }
+        return false;
+    }
+
     @Override
     protected void revertUpdateToRuntime(OperationContext context, ModelNode operation, String attributeName,
             ModelNode valueToRestore, ModelNode valueToRevert, WSServerConfigAttributeHandler.RollbackInfo handback) throws OperationFailedException {