[1065461] readOnly configuration is editable via CLI

- an NPE fix to prior commit 1b551ae
rhq-project · Apr 23, 2014 · 0a68d68 · 0a68d68
1 parent 949ad3c
commit 0a68d68
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/...les/core/domain/src/main/java/org/rhq/core/domain/configuration/ConfigurationUtility.java b/...les/core/domain/src/main/java/org/rhq/core/domain/configuration/ConfigurationUtility.java
@@ -388,14 +388,12 @@ private static void validatePropertySimple(PropertyDefinition propertyDefinition
     private static void validatePropertyMap(AbstractPropertyMap propertyMap, AbstractPropertyMap currentPropertyMap,
         PropertyDefinitionMap propertyDefinitionMap, List<String> errorMessages) {
         // if the entire map is read-only then the new map must match the current map if the current map is non-empty
-        if (propertyDefinitionMap.isReadOnly()) {
-            if (!currentPropertyMap.getMap().isEmpty()) {
-                if (!propertyMap.getMap().equals(currentPropertyMap.getMap())) {
-                    errorMessages.add("ReadOnly property '" + propertyDefinitionMap.getName() + "' has a value "
-                        + propertyMap.getMap() + " different than the current value " + currentPropertyMap.getMap()
-                        + "]. It is not allowed to change.");
-                    return;
-                }
+        if (propertyDefinitionMap.isReadOnly() && null != currentPropertyMap && !currentPropertyMap.getMap().isEmpty()) {
+            if (!propertyMap.getMap().equals(currentPropertyMap.getMap())) {
+                errorMessages.add("ReadOnly property '" + propertyDefinitionMap.getName() + "' has a value "
+                    + propertyMap.getMap() + " different than the current value " + currentPropertyMap.getMap()
+                    + "]. It is not allowed to change.");
+                return;
             }
         }