ARTEMIS-4212 fix tests

apache · Apr 28, 2023 · acd6605 · acd6605
1 parent 1fa5c76
commit acd6605
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/Bindings.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/Bindings.java
@@ -62,4 +62,8 @@ public interface Bindings extends UnproposalListener {
    void forEach(BiConsumer<String, Binding> bindingConsumer);
 
    int size();
+
+   default boolean contains(Class clazz) {
+      return false;
+   }
 }
diff --git a/...s-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/BindingsImpl.java b/...s-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/BindingsImpl.java
@@ -200,6 +200,17 @@ public int size() {
       return bindingsNameMap.size();
    }
 
+   @Override
+   public boolean contains(Class clazz) {
+      for (Binding binding : getBindings()) {
+         if (clazz.isInstance(binding)) {
+            return true;
+         }
+      }
+
+      return false;
+   }
+
 
    @Override
    public Message redistribute(final Message message,

diff --git a/...-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java b/...-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
@@ -64,6 +64,7 @@
 import org.apache.activemq.artemis.core.postoffice.PostOffice;
 import org.apache.activemq.artemis.core.postoffice.QueueBinding;
 import org.apache.activemq.artemis.core.postoffice.RoutingStatus;
+import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
 import org.apache.activemq.artemis.core.protocol.core.CoreRemotingConnection;
 import org.apache.activemq.artemis.core.remoting.CertificateUtil;
 import org.apache.activemq.artemis.core.remoting.CloseListener;
@@ -1809,7 +1810,7 @@ public AutoCreateResult checkAutoCreate(final QueueConfiguration queueConfig) th
          if (server.locateQueue(unPrefixedQueue) == null) {
             // The queue doesn't exist.
             Bindings bindings = server.getPostOffice().lookupBindingsForAddress(unPrefixedAddress);
-            if (bindings != null && !queueConfig.isFqqn()) {
+            if (bindings != null && bindings.contains(LocalQueueBinding.class) && !queueConfig.isFqqn()) {
                // The address has another queue with a different name, which is fine. Just ignore it.
                result = AutoCreateResult.EXISTED;
             } else if (addressSettings.isAutoCreateQueues() || queueConfig.isTemporary()) {

diff --git a/...c/test/java/org/apache/activemq/artemis/tests/integration/amqp/QueueAutoCreationTest.java b/...c/test/java/org/apache/activemq/artemis/tests/integration/amqp/QueueAutoCreationTest.java
@@ -143,7 +143,7 @@ public void testAutoCreateOnTopicManySends() throws Exception {
       Connection connection = factory.createConnection();
       SimpleString addressName = UUIDGenerator.getInstance().generateSimpleStringUUID();
       logger.debug("Address is {}", addressName);
-      clientSession.createAddress(addressName, RoutingType.ANYCAST, false);
+      clientSession.createAddress(addressName, RoutingType.MULTICAST, false);
 
       Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
       for (int i = 0; i < 10; i++) {