Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AMQ7135 : do a purge before deleting the destination 

(cherry picked from commit 9f513f8878)
This commit is contained in:
hkesler 2019-01-12 22:47:16 -05:00 committed by jgoodyear
parent 03ce997ff2
commit 5c23dd53ad
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
activemq-broker/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java
View File

@ -297,6 +297,9 @@ public abstract class AbstractRegion implements Region {
}
}
destinationMap.unsynchronizedRemove(destination, dest);
if (dest instanceof Queue){
((Queue) dest).purge();
}
dispose(context, dest);
DestinationInterceptor destinationInterceptor = broker.getDestinationInterceptor();
if (destinationInterceptor != null) {

41
activemq-unit-tests/src/test/java/org/apache/activemq/RemoveDestinationTest.java
View File

@ -26,6 +26,7 @@ import javax.jms.Connection;
import javax.jms.JMSException;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.jms.Queue;
import javax.jms.Session;
import javax.jms.TextMessage;
import javax.jms.Topic;
@ -35,6 +36,7 @@ import org.apache.activemq.advisory.DestinationSource;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.jmx.DestinationViewMBean;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.util.Wait;
import org.junit.After;
@ -74,6 +76,45 @@ public class RemoveDestinationTest {
return conn;
}
@Test(timeout = 60000)
public void testRemoveQueue() throws Exception {
ActiveMQConnection amqConnection = (ActiveMQConnection) createConnection(true);
final DestinationSource destinationSource = amqConnection.getDestinationSource();
Session session = amqConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
Queue queue = session.createQueue("TEST.FOO");
MessageProducer producer = session.createProducer(queue);
MessageConsumer consumer = session.createConsumer(queue);
TextMessage msg = session.createTextMessage("Hellow World");
producer.send(msg);
assertNotNull(consumer.receive(5000));
final ActiveMQQueue amqQueue = (ActiveMQQueue) queue;
consumer.close();
producer.close();
session.close();
assertTrue("Destination discovered", Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisified() throws Exception {
return destinationSource.getQueues().contains(amqQueue);
}
}, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(100)));
amqConnection.destroyDestination((ActiveMQDestination) queue);
assertTrue("Destination is removed", Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisified() throws Exception {
return !destinationSource.getQueues().contains(amqQueue);
}
}, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(100)));
}
@Test(timeout = 60000)
public void testRemoveDestinationWithoutSubscriber() throws Exception {