Fix ActiveMQDynamicProducerResourceTest
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f51f4356 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f51f4356 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f51f4356 Branch: refs/heads/ARTEMIS-780 Commit: f51f4356cc75274915ea4cd760674a4447a4c849 Parents: d4a54af Author: jbertram <[email protected]> Authored: Mon Nov 14 12:02:05 2016 -0600 Committer: jbertram <[email protected]> Committed: Tue Nov 15 10:36:42 2016 -0600 ---------------------------------------------------------------------- .../artemis/core/postoffice/impl/SimpleAddressManager.java | 1 + .../activemq/artemis/core/server/impl/ActiveMQServerImpl.java | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f51f4356/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java index 6ed2564..bfdfb8a 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java @@ -29,6 +29,7 @@ import org.apache.activemq.artemis.core.postoffice.Binding; import org.apache.activemq.artemis.core.postoffice.Bindings; import org.apache.activemq.artemis.core.postoffice.BindingsFactory; import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle; +import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; import org.apache.activemq.artemis.core.server.impl.AddressInfo; import org.apache.activemq.artemis.core.transaction.Transaction; import org.jboss.logging.Logger; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f51f4356/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java index 28622a5..a4c139b 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java @@ -641,11 +641,7 @@ public class ActiveMQServerImpl implements ActiveMQServer { } } - if (autoCreateJmsTopics) { - putAddressInfoIfAbsent(new AddressInfo(address)); - } - - return new BindingQueryResult(getAddressInfo(address) != null, names, autoCreateJmsQueues, autoCreateJmsTopics); + return new BindingQueryResult(!names.isEmpty(), names, autoCreateJmsQueues, autoCreateJmsTopics); } @Override
