Author: tabish
Date: Sun Sep 11 19:56:20 2011
New Revision: 1169514
URL: http://svn.apache.org/viewvc?rev=1169514&view=rev
Log:
fix for: https://issues.apache.org/jira/browse/AMQ-3488 along with test case
Added:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/TempQueueDeleteOnCloseTest.java
(with props)
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java?rev=1169514&r1=1169513&r2=1169514&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java
Sun Sep 11 19:56:20 2011
@@ -96,6 +96,7 @@ public class AdvisoryConsumer implements
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);
Added:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/TempQueueDeleteOnCloseTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/TempQueueDeleteOnCloseTest.java?rev=1169514&view=auto
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/TempQueueDeleteOnCloseTest.java
(added)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/TempQueueDeleteOnCloseTest.java
Sun Sep 11 19:56:20 2011
@@ -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();
+ }
+}
Propchange:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/TempQueueDeleteOnCloseTest.java
------------------------------------------------------------------------------
svn:eol-style = native
