WFLY-8238 messaging subsys doesn't allow undefining attribute

...if alternatives aren't set, even if the element is marked as not required. * improving memory footprint
wildfly · Mar 3, 2017 · 4c72284 · 4c72284
1 parent a3ccb75
commit 4c72284
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/...ing-activemq/src/main/java/org/wildfly/extension/messaging/activemq/BridgeDefinition.java b/...ing-activemq/src/main/java/org/wildfly/extension/messaging/activemq/BridgeDefinition.java
@@ -179,9 +179,10 @@ public Collection<AttributeDefinition> getAttributes() {
 
     @Override
     public void registerAttributes(ManagementResourceRegistration registry) {
+        ReloadRequiredWriteAttributeHandler reloadRequiredWriteAttributeHandler = new ReloadRequiredWriteAttributeHandler(ATTRIBUTES);
         for (AttributeDefinition attr : ATTRIBUTES) {
             if (!attr.getFlags().contains(AttributeAccess.Flag.STORAGE_RUNTIME)) {
-                registry.registerReadWriteAttribute(attr, null, new ReloadRequiredWriteAttributeHandler(ATTRIBUTES));
+                registry.registerReadWriteAttribute(attr, null, reloadRequiredWriteAttributeHandler);
             }
         }
 

diff --git a/...q/src/main/java/org/wildfly/extension/messaging/activemq/ClusterConnectionDefinition.java b/...q/src/main/java/org/wildfly/extension/messaging/activemq/ClusterConnectionDefinition.java
@@ -253,9 +253,10 @@ public Collection<AttributeDefinition> getAttributes() {
 
     @Override
     public void registerAttributes(ManagementResourceRegistration registry) {
+        ReloadRequiredWriteAttributeHandler reloadRequiredWriteAttributeHandler = new ReloadRequiredWriteAttributeHandler(ATTRIBUTES);
         for (AttributeDefinition attr : ATTRIBUTES) {
             if (!attr.getFlags().contains(AttributeAccess.Flag.STORAGE_RUNTIME)) {
-                registry.registerReadWriteAttribute(attr, null, new ReloadRequiredWriteAttributeHandler(ATTRIBUTES));
+                registry.registerReadWriteAttribute(attr, null, reloadRequiredWriteAttributeHandler);
             }
         }
 

diff --git a/...vemq/src/main/java/org/wildfly/extension/messaging/activemq/DiscoveryGroupDefinition.java b/...vemq/src/main/java/org/wildfly/extension/messaging/activemq/DiscoveryGroupDefinition.java
@@ -99,9 +99,10 @@ public Collection<AttributeDefinition> getAttributes() {
 
     @Override
     public void registerAttributes(ManagementResourceRegistration registry) {
+        ReloadRequiredWriteAttributeHandler reloadRequiredWriteAttributeHandler = new ReloadRequiredWriteAttributeHandler(ATTRIBUTES);
         for (AttributeDefinition attr : ATTRIBUTES) {
             if (registerRuntimeOnly || !attr.getFlags().contains(AttributeAccess.Flag.STORAGE_RUNTIME)) {
-                registry.registerReadWriteAttribute(attr, null, new ReloadRequiredWriteAttributeHandler(ATTRIBUTES));
+                registry.registerReadWriteAttribute(attr, null, reloadRequiredWriteAttributeHandler);
             }
         }
     }

diff --git a/.../java/org/wildfly/extension/messaging/activemq/jms/PooledConnectionFactoryDefinition.java b/.../java/org/wildfly/extension/messaging/activemq/jms/PooledConnectionFactoryDefinition.java
@@ -128,13 +128,14 @@ public Collection<AttributeDefinition> getAttributes() {
 
     @Override
     public void registerAttributes(ManagementResourceRegistration registry) {
-        for (AttributeDefinition attr : getDefinitions(ATTRIBUTES)) {
+        AttributeDefinition[] definitions = getDefinitions(ATTRIBUTES);
+        ReloadRequiredWriteAttributeHandler reloadRequiredWriteAttributeHandler = new ReloadRequiredWriteAttributeHandler(definitions);
+        for (AttributeDefinition attr : definitions) {
             if (!attr.getFlags().contains(AttributeAccess.Flag.STORAGE_RUNTIME)) {
                 if (deployed) {
                     registry.registerReadOnlyAttribute(attr, PooledConnectionFactoryConfigurationRuntimeHandler.INSTANCE);
                 } else {
-                    registry.registerReadWriteAttribute(attr, null,
-                            new ReloadRequiredWriteAttributeHandler(getDefinitions(PooledConnectionFactoryDefinition.ATTRIBUTES)));
+                    registry.registerReadWriteAttribute(attr, null, reloadRequiredWriteAttributeHandler);
                 }
             }
         }

diff --git a/...rc/main/java/org/wildfly/extension/messaging/activemq/jms/bridge/JMSBridgeDefinition.java b/...rc/main/java/org/wildfly/extension/messaging/activemq/jms/bridge/JMSBridgeDefinition.java
@@ -248,8 +248,9 @@ public Collection<AttributeDefinition> getAttributes() {
 
     @Override
     public void registerAttributes(ManagementResourceRegistration registry) {
+        ReloadRequiredWriteAttributeHandler reloadRequiredWriteAttributeHandler = new ReloadRequiredWriteAttributeHandler(ATTRIBUTES);
         for (AttributeDefinition attr : ATTRIBUTES) {
-            registry.registerReadWriteAttribute(attr, null, new ReloadRequiredWriteAttributeHandler(ATTRIBUTES));
+            registry.registerReadWriteAttribute(attr, null, reloadRequiredWriteAttributeHandler);
         }
         for (AttributeDefinition attr : READONLY_ATTRIBUTES) {
             registry.registerReadOnlyAttribute(attr, JMSBridgeHandler.INSTANCE);