Ensure AddressInfo record is created on autoCreate

Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b3acd162
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b3acd162
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b3acd162

Branch: refs/heads/ARTEMIS-780
Commit: b3acd1622bd659860b0decb51052fcdbe4fa9e7d
Parents: baa95aa
Author: Martyn Taylor <mtay...@redhat.com>
Authored: Thu Dec 1 15:47:06 2016 +0000
Committer: Martyn Taylor <mtay...@redhat.com>
Committed: Thu Dec 1 15:47:06 2016 +0000

----------------------------------------------------------------------
 .../activemq/artemis/core/server/impl/ActiveMQServerImpl.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b3acd162/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 7f103e7..013bced 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
@@ -2407,7 +2407,7 @@ public class ActiveMQServerImpl implements ActiveMQServer 
{
 
       if (info == null) {
          if (autoCreateAddress) {
-            postOffice.addAddressInfo(defaultAddressInfo.setAutoCreated(true));
+            createAddressInfo(defaultAddressInfo.setAutoCreated(true));
             addressAlreadyExists = false;
          } else {
             throw 
ActiveMQMessageBundle.BUNDLE.addressDoesNotExist(addressName);
@@ -2420,7 +2420,7 @@ public class ActiveMQServerImpl implements ActiveMQServer 
{
 
       AddressInfo addressInfo = postOffice.getAddressInfo(queue.getAddress());
       if (addressInfo == null) {
-         postOffice.addAddressInfo(new AddressInfo(queue.getAddress()));
+         createAddressInfo(new AddressInfo(queue.getAddress()));
       } else {
          if (!addressInfo.getRoutingTypes().contains(routingType)) {
             throw 
ActiveMQMessageBundle.BUNDLE.invalidRoutingTypeForAddress(routingType, 
addressInfo.getName().toString(), addressInfo.getRoutingTypes());

Reply via email to