Fix NPE when ENABLED_ATTRIBUTE is not set

rhq-project · Jul 29, 2014 · 58369f1 · 58369f1
1 parent 12c727d
commit 58369f1
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/...lugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java b/...lugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java
@@ -275,10 +275,13 @@ public void updateResourceConfiguration(final ConfigurationUpdateReport configur
             return;
         }
 
-        Boolean enabledAttributeConfigValue = config.getSimple(ENABLED_ATTRIBUTE).getBooleanValue();
-        if (enabledAttributeConfigValue == null) {
+        PropertySimple enabledAttributeSimpleConfigValue = config.getSimple(ENABLED_ATTRIBUTE);
+        Boolean enabledAttributeConfigValue = null;
+        if(enabledAttributeSimpleConfigValue == null) {
             // True if unset
             enabledAttributeConfigValue = TRUE;
+        } else {
+            enabledAttributeConfigValue = enabledAttributeSimpleConfigValue.getBooleanValue();
         }
 
         // Check if the datasource is currently enabled