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

This closes #2878

This commit is contained in:
Clebert Suconic 2019-11-05 16:05:28 -05:00
parent 8c7f120e0a 83e2595618
commit 367f18bee3
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
View File

@ -3014,9 +3014,11 @@ public class ActiveMQServerImpl implements ActiveMQServer {
.collect(Collectors.toSet()); .collect(Collectors.toSet());
for (SimpleString addressName : listAddressNames()) { for (SimpleString addressName : listAddressNames()) {
AddressInfo addressInfo = getAddressInfo(addressName);
AddressSettings addressSettings = getAddressSettingsRepository().getMatch(addressName.toString()); AddressSettings addressSettings = getAddressSettingsRepository().getMatch(addressName.toString());
if (!addressesInConfig.contains(addressName.toString()) && addressSettings.getConfigDeleteAddresses() == DeletionPolicy.FORCE) { if (!addressesInConfig.contains(addressName.toString()) && addressInfo != null && !addressInfo.isAutoCreated() &&
addressSettings.getConfigDeleteAddresses() == DeletionPolicy.FORCE) {
for (Queue queue : listQueues(addressName)) { for (Queue queue : listQueues(addressName)) {
ActiveMQServerLogger.LOGGER.undeployQueue(queue.getName()); ActiveMQServerLogger.LOGGER.undeployQueue(queue.getName());
try { try {

4
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java
View File

@ -84,6 +84,8 @@ public class RedeployTest extends ActiveMQTestBase {
Assert.assertNotNull("Address wasn't autocreated accordingly", consumer.receive(5000)); Assert.assertNotNull("Address wasn't autocreated accordingly", consumer.receive(5000));
} }
Assert.assertNotNull(getQueue(embeddedActiveMQ, "autoQueue"));
// this simulates a remote queue or other type being added that wouldnt get deleted, its not valid to have this happen but it can happen when addresses and queues are auto created in a clustered env // this simulates a remote queue or other type being added that wouldnt get deleted, its not valid to have this happen but it can happen when addresses and queues are auto created in a clustered env
embeddedActiveMQ.getActiveMQServer().getPostOffice().addBinding(new RemoteQueueBindingImpl(5L, embeddedActiveMQ.getActiveMQServer().getPostOffice().addBinding(new RemoteQueueBindingImpl(5L,
new SimpleString("autoQueue"), new SimpleString("autoQueue"),
@ -117,6 +119,8 @@ public class RedeployTest extends ActiveMQTestBase {
Assert.assertTrue(tryConsume()); Assert.assertTrue(tryConsume());
Assert.assertNotNull(getQueue(embeddedActiveMQ, "autoQueue"));
factory = new ActiveMQConnectionFactory(); factory = new ActiveMQConnectionFactory();
try (Connection connection = factory.createConnection()) { try (Connection connection = factory.createConnection()) {
Session session = connection.createSession(); Session session = connection.createSession();