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 #1432

This commit is contained in:
Clebert Suconic 2017-08-02 12:50:35 -04:00
parent 42dbd02bda 776ec0b9fd
commit 2eada40fb0
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
View File

@ -169,7 +169,7 @@ public class SimpleAddressManager implements AddressManager {
@Override @Override
public Set<SimpleString> getAddresses() { public Set<SimpleString> getAddresses() {
Set<SimpleString> addresses = new HashSet<>(); Set<SimpleString> addresses = new HashSet<>();
addresses.addAll(mappings.keySet()); addresses.addAll(addressInfoMap.keySet());
return addresses; return addresses;
} }

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

@ -136,6 +136,7 @@ public class RedeployTest extends ActiveMQTestBase {
try { try {
latch.await(10, TimeUnit.SECONDS); latch.await(10, TimeUnit.SECONDS);
Assert.assertNotNull(getAddressInfo(embeddedJMS, "config_test_address_removal_no_queue"));
Assert.assertNotNull(getAddressInfo(embeddedJMS, "config_test_address_removal")); Assert.assertNotNull(getAddressInfo(embeddedJMS, "config_test_address_removal"));
Assert.assertNotNull(getAddressInfo(embeddedJMS, "config_test_queue_removal")); Assert.assertNotNull(getAddressInfo(embeddedJMS, "config_test_queue_removal"));
Assert.assertTrue(listQueuesNamesForAddress(embeddedJMS, "config_test_queue_removal").contains("config_test_queue_removal_queue_1")); Assert.assertTrue(listQueuesNamesForAddress(embeddedJMS, "config_test_queue_removal").contains("config_test_queue_removal_queue_1"));
@ -153,6 +154,7 @@ public class RedeployTest extends ActiveMQTestBase {
embeddedJMS.getActiveMQServer().getReloadManager().setTick(tick); embeddedJMS.getActiveMQServer().getReloadManager().setTick(tick);
latch.await(10, TimeUnit.SECONDS); latch.await(10, TimeUnit.SECONDS);
Assert.assertNull(getAddressInfo(embeddedJMS, "config_test_address_removal_no_queue"));
Assert.assertNull(getAddressInfo(embeddedJMS, "config_test_address_removal")); Assert.assertNull(getAddressInfo(embeddedJMS, "config_test_address_removal"));
Assert.assertNotNull(getAddressInfo(embeddedJMS, "config_test_queue_removal")); Assert.assertNotNull(getAddressInfo(embeddedJMS, "config_test_queue_removal"));
Assert.assertTrue(listQueuesNamesForAddress(embeddedJMS, "config_test_queue_removal").contains("config_test_queue_removal_queue_1")); Assert.assertTrue(listQueuesNamesForAddress(embeddedJMS, "config_test_queue_removal").contains("config_test_queue_removal_queue_1"));

4
tests/integration-tests/src/test/resources/reload-address-queues.xml
View File

@ -127,6 +127,10 @@ under the License.
<queue name="config_test_address_removal_queue"/> <queue name="config_test_address_removal_queue"/>
</multicast> </multicast>
</address> </address>
<address name="config_test_address_removal_no_queue">
<multicast>
</multicast>
</address>
<address name="permanent_test_queue_removal"> <address name="permanent_test_queue_removal">
<multicast> <multicast>
<queue name="permanent_test_queue_removal_queue_1"/> <queue name="permanent_test_queue_removal_queue_1"/>