Author: clebert.suconic(a)jboss.com Date: 2011-03-14 19:48:55 -0400 (Mon, 14 Mar 2011) New Revision: 10328 Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/api/core/management/ObjectNameBuilder.java branches/Branch_2_2_EAP/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java Log: https://issues.jboss.org/browse/JBPAPP-6082 - fixing tests Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/api/core/management/ObjectNameBuilder.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/api/core/management/ObjectNameBuilder.java 2011-03-14 22:07:55 UTC (rev 10327) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/api/core/management/ObjectNameBuilder.java 2011-03-14 23:48:55 UTC (rev 10328) @@ -50,7 +50,14 @@ public static ObjectNameBuilder create(final String domain) { - return new ObjectNameBuilder(domain); + if (domain == null) + { + return new ObjectNameBuilder(ConfigurationImpl.DEFAULT_JMX_DOMAIN); + } + else + { + return new ObjectNameBuilder(domain); + } } // Constructors -------------------------------------------------- Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java 2011-03-14 22:07:55 UTC (rev 10327) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java 2011-03-14 23:48:55 UTC (rev 10328) @@ -55,7 +55,7 @@ public JMSConfigurationImpl() { - domain = null; + domain = ConfigurationImpl.DEFAULT_JMX_DOMAIN; } public JMSConfigurationImpl(final List<ConnectionFactoryConfiguration> connectionFactoryConfigurations, @@ -66,7 +66,7 @@ this.connectionFactoryConfigurations.addAll(connectionFactoryConfigurations); this.queueConfigurations.addAll(queueConfigurations); this.topicConfigurations.addAll(topicConfigurations); - this.domain = domain; + this.domain = domain != null ? domain : ConfigurationImpl.DEFAULT_JMX_DOMAIN; } // JMSConfiguration implementation -------------------------------