[activemq-artemis] branch main updated: ARTEMIS-4125 Fixing AutoCreate Topics remove of the address

[jb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
     new c231e6a643 ARTEMIS-4125 Fixing AutoCreate Topics remove of the address
c231e6a643 is described below

commit c231e6a643038b1ed57b0bdf8b2b9964c3472879
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Thu Jan 12 11:32:10 2023 -0500

    ARTEMIS-4125 Fixing AutoCreate Topics remove of the address
    
    This is fixing AutoCreateJmsDestinationTest::testAutoCreateOnSubscribeToTopic
---
 .../apache/activemq/artemis/core/server/impl/ServerSessionImpl.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
index 1128cd8a20..fe9773d45c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
@@ -1132,7 +1132,8 @@ public class ServerSessionImpl implements ServerSession, FailureListener {
                return;
             }
             logger.debug("deleting temporary queue {}", bindingName);
-            server.destroyQueue(bindingName, null, false, false, server.getAddressInfo(binding.getAddress()).isTemporary());
+            AddressInfo addressInfo = server.getAddressInfo(binding.getAddress());
+            server.destroyQueue(bindingName, null, false, false, addressInfo == null || addressInfo.isTemporary() || addressInfo.isAutoCreated());
             if (observer != null) {
                observer.tempQueueDeleted(bindingName);
             }