Merge pull request #8620 from jmesnil/WFLY-6077_auto-jms-queues_attri…

…butes [WFLY-6077] address-settings's auto-create|delete-jms-queues
wildfly · Jan 29, 2016 · 06ee4cc · 06ee4cc
2 parents 52ce361 + 5212ff9
commit 06ee4cc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/...ng-activemq/src/main/java/org/wildfly/extension/messaging/activemq/AddressSettingAdd.java b/...ng-activemq/src/main/java/org/wildfly/extension/messaging/activemq/AddressSettingAdd.java
@@ -140,12 +140,9 @@ static AddressSettings createSettings(final OperationContext context, final Mode
         if (config.hasDefined(AddressSettingDefinition.SLOW_CONSUMER_THRESHOLD.getName())) {
             settings.setSlowConsumerThreshold(AddressSettingDefinition.SLOW_CONSUMER_THRESHOLD.resolveModelAttribute(context, config).asLong());
         }
-        if (config.hasDefined(AddressSettingDefinition.AUTO_CREATE_JMS_QUEUES.getName())) {
-            settings.setAutoCreateJmsQueues(AddressSettingDefinition.AUTO_CREATE_JMS_QUEUES.resolveModelAttribute(context, config).asBoolean());
-        }
-        if (config.hasDefined(AddressSettingDefinition.AUTO_DELETE_JMS_QUEUES.getName())) {
-            settings.setAutoDeleteJmsQueues(AddressSettingDefinition.AUTO_DELETE_JMS_QUEUES.resolveModelAttribute(context, config).asBoolean());
-        }
+        // always set the auto-create|delete-jms-queues attributes as their default attribute values differ from Artemis defaults.
+        settings.setAutoCreateJmsQueues(AddressSettingDefinition.AUTO_CREATE_JMS_QUEUES.resolveModelAttribute(context, config).asBoolean());
+        settings.setAutoDeleteJmsQueues(AddressSettingDefinition.AUTO_DELETE_JMS_QUEUES.resolveModelAttribute(context, config).asBoolean());
         return settings;
     }
 

diff --git a/...vemq/src/main/java/org/wildfly/extension/messaging/activemq/AddressSettingDefinition.java b/...vemq/src/main/java/org/wildfly/extension/messaging/activemq/AddressSettingDefinition.java
@@ -53,13 +53,15 @@
 public class AddressSettingDefinition extends PersistentResourceDefinition {
 
     public static final SimpleAttributeDefinition AUTO_CREATE_JMS_QUEUES = create("auto-create-jms-queues", ModelType.BOOLEAN)
-            .setDefaultValue(new ModelNode(AddressSettings.DEFAULT_AUTO_CREATE_QUEUES))
+            // Default value is false to have the same behaviour than the legacy messaging subsystem (Artemis defaults to true)
+            .setDefaultValue(new ModelNode(false))
             .setAllowNull(true)
             .setAllowExpression(true)
             .build();
 
     public static final SimpleAttributeDefinition AUTO_DELETE_JMS_QUEUES = create("auto-delete-jms-queues", ModelType.BOOLEAN)
-            .setDefaultValue(new ModelNode(AddressSettings.DEFAULT_AUTO_DELETE_QUEUES))
+            // Default value is false to have the same behaviour than the legacy messaging subsystem (Artemis defaults to true)
+            .setDefaultValue(new ModelNode(false))
             .setAllowNull(true)
             .setAllowExpression(true)
             .build();