From 4f14f1e5c09170abf94dd48541b6e572a1ca59f5 Mon Sep 17 00:00:00 2001
From: "Timothy A. Bish" <tabish@apache.org>
Date: Sun, 11 Sep 2011 19:56:20 +0000
Subject: [PATCH] fix for: https://issues.apache.org/jira/browse/AMQ-3488 along
 with test case

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1169514 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/activemq/AdvisoryConsumer.java |  1 +
 .../bugs/TempQueueDeleteOnCloseTest.java      | 54 +++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 activemq-core/src/test/java/org/apache/activemq/bugs/TempQueueDeleteOnCloseTest.java

diff --git a/activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java b/activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java
index 0a61c8ae3e..475af7ba00 100755
--- a/activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java
+++ b/activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java
@@ -96,6 +96,7 @@ public class AdvisoryConsumer implements ActiveMQDispatcher {
 
         ActiveMQTempDestination tempDest = (ActiveMQTempDestination)dest;
         if (dinfo.getOperationType() == DestinationInfo.ADD_OPERATION_TYPE) {
+            tempDest.setConnection(null);
             connection.activeTempDestinations.put(tempDest, tempDest);
         } else if (dinfo.getOperationType() == DestinationInfo.REMOVE_OPERATION_TYPE) {
             connection.activeTempDestinations.remove(tempDest);
diff --git a/activemq-core/src/test/java/org/apache/activemq/bugs/TempQueueDeleteOnCloseTest.java b/activemq-core/src/test/java/org/apache/activemq/bugs/TempQueueDeleteOnCloseTest.java
new file mode 100644
index 0000000000..44e7f5d8ab
--- /dev/null
+++ b/activemq-core/src/test/java/org/apache/activemq/bugs/TempQueueDeleteOnCloseTest.java
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.bugs;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import javax.jms.MessageConsumer;
+import javax.jms.Session;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.junit.Test;
+
+/**
+ * Demonstrates how unmarshalled VM advisory messages for temporary queues prevent other connections from being closed.
+ */
+public class TempQueueDeleteOnCloseTest {
+
+    @Test
+    public void test() throws Exception {
+        ConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://localhost");
+
+        // create a connection and session with a temporary queue
+        Connection connectionA = connectionFactory.createConnection();
+        connectionA.setClientID("ConnectionA");
+        Session sessionA = connectionA.createSession(false, Session.AUTO_ACKNOWLEDGE);
+        Destination tempQueueA = sessionA.createTemporaryQueue();
+        MessageConsumer consumer = sessionA.createConsumer(tempQueueA);
+        connectionA.start();
+
+        // start and stop another connection
+        Connection connectionB = connectionFactory.createConnection();
+        connectionB.setClientID("ConnectionB");
+        connectionB.start();
+        connectionB.close();
+
+        consumer.close();
+        connectionA.close();
+    }
+}