ARTEMIS-4577 Send CONNECTION_CLOSED event after deleting temporary re…

…sources
apache · Jan 22, 2024 · fe5afc1 · fe5afc1
1 parent eb7d131
commit fe5afc1
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASessionFactoryImpl.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASessionFactoryImpl.java
@@ -586,18 +586,6 @@ public void close() throws JMSException {
 
       closed = true;
 
-      synchronized (sessions) {
-         for (Iterator<ActiveMQRASession> i = sessions.iterator(); i.hasNext(); ) {
-            ActiveMQRASession session = i.next();
-            try {
-               session.closeSession();
-            } catch (Throwable t) {
-               logger.trace("Error closing session", t);
-            }
-            i.remove();
-         }
-      }
-
       synchronized (tempQueues) {
          for (Iterator<TemporaryQueue> i = tempQueues.iterator(); i.hasNext(); ) {
             TemporaryQueue temp = i.next();
@@ -623,6 +611,18 @@ public void close() throws JMSException {
             i.remove();
          }
       }
+
+      synchronized (sessions) {
+         for (Iterator<ActiveMQRASession> i = sessions.iterator(); i.hasNext(); ) {
+            ActiveMQRASession session = i.next();
+            try {
+               session.closeSession();
+            } catch (Throwable t) {
+               logger.trace("Error closing session", t);
+            }
+            i.remove();
+         }
+      }
    }
 
    /**