Repository: activemq Updated Branches: refs/heads/master bab0887ed -> ef84db5e6
AMQ-6610: Fixing JDBC test Durable destinations need to always be loaded on connector start Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/ef84db5e Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/ef84db5e Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/ef84db5e Branch: refs/heads/master Commit: ef84db5e64b7a96a0c5c7271bd88642d940ba7a4 Parents: bab0887 Author: Christopher L. Shannon (cshannon) <[email protected]> Authored: Mon Feb 27 07:34:22 2017 -0500 Committer: Christopher L. Shannon (cshannon) <[email protected]> Committed: Mon Feb 27 07:34:22 2017 -0500 ---------------------------------------------------------------------- .../java/org/apache/activemq/broker/BrokerService.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/ef84db5e/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java ---------------------------------------------------------------------- diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java index 14e86e8..8cd15d8 100644 --- a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java +++ b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java @@ -2604,6 +2604,7 @@ public class BrokerService implements Service { * @throws Exception */ public void startAllConnectors() throws Exception { + final Set<ActiveMQDestination> durableDestinations = getBroker().getDurableDestinations(); List<TransportConnector> al = new ArrayList<>(); for (Iterator<TransportConnector> iter = getTransportConnectors().iterator(); iter.hasNext();) { TransportConnector connector = iter.next(); @@ -2642,7 +2643,7 @@ public class BrokerService implements Service { for (Iterator<NetworkConnector> iter = getNetworkConnectors().iterator(); iter.hasNext();) { final NetworkConnector connector = iter.next(); connector.setLocalUri(uri); - startNetworkConnector(connector, networkConnectorStartExecutor); + startNetworkConnector(connector, durableDestinations, networkConnectorStartExecutor); } if (networkConnectorStartExecutor != null) { // executor done when enqueued tasks are complete @@ -2666,10 +2667,16 @@ public class BrokerService implements Service { public void startNetworkConnector(final NetworkConnector connector, final ThreadPoolExecutor networkConnectorStartExecutor) throws Exception { + startNetworkConnector(connector, getBroker().getDurableDestinations(), networkConnectorStartExecutor); + } + + public void startNetworkConnector(final NetworkConnector connector, + final Set<ActiveMQDestination> durableDestinations, + final ThreadPoolExecutor networkConnectorStartExecutor) throws Exception { connector.setBrokerName(getBrokerName()); //set the durable destinations to match the broker if not set on the connector if (connector.getDurableDestinations() == null) { - connector.setDurableDestinations(getBroker().getDurableDestinations()); + connector.setDurableDestinations(durableDestinations); } String defaultSocketURI = getDefaultSocketURIString(); if (defaultSocketURI != null) {
