From f5599c6630d01e7872e227a1ceef32dacb9f7c3c Mon Sep 17 00:00:00 2001
From: Justin Bertram <jbertram@apache.org>
Date: Tue, 7 Feb 2017 13:45:24 -0600
Subject: [PATCH] ARTEMIS-947 reload <addresses> on broker.xml change

---
 .../artemis/core/server/impl/ActiveMQServerImpl.java        | 6 ++++++
 docs/user-manual/en/config-reload.md                        | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 75751007c1..a2ef3e6737 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -2226,6 +2226,10 @@ public class ActiveMQServerImpl implements ActiveMQServer {
    }
 
    private void deployAddressesFromConfiguration() throws Exception {
+      deployAddressesFromConfiguration(configuration);
+   }
+
+   private void deployAddressesFromConfiguration(Configuration configuration) throws Exception {
       for (CoreAddressConfiguration config : configuration.getAddressConfigurations()) {
          AddressInfo info = new AddressInfo(SimpleString.toSimpleString(config.getName()), config.getRoutingTypes());
          addOrUpdateAddressInfo(info);
@@ -2719,6 +2723,8 @@ public class ActiveMQServerImpl implements ActiveMQServer {
                deployDivert(divertConfig);
             }
          }
+         ActiveMQServerLogger.LOGGER.reloadingConfiguration("addresses");
+         deployAddressesFromConfiguration(config);
       }
    }
 }
diff --git a/docs/user-manual/en/config-reload.md b/docs/user-manual/en/config-reload.md
index 50d9c251b0..1fba9d6205 100644
--- a/docs/user-manual/en/config-reload.md
+++ b/docs/user-manual/en/config-reload.md
@@ -6,8 +6,8 @@ Once the configuration file is changed (broker.xml) the following modules will b
 
 - Address Settings
 - Security Settings
-- JMS Queues
-- JMS Topics
+- Diverts
+- Addresses & queues
 
 
-Notice: Queues and Topics won't be removed upon reload, given the risk of losing messages. You may execute explicit CLI or Management operations to remove destinations.
\ No newline at end of file
+Notice: Address & queues won't be removed upon reload, given the risk of losing messages. You may execute explicit CLI or Management operations to remove destinations.
\ No newline at end of file