Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B69D1200B96 for ; Wed, 21 Sep 2016 23:09:50 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B393E160ABC; Wed, 21 Sep 2016 21:09:50 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 06034160ADB for ; Wed, 21 Sep 2016 23:09:49 +0200 (CEST) Received: (qmail 11094 invoked by uid 500); 21 Sep 2016 21:09:49 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 10992 invoked by uid 99); 21 Sep 2016 21:09:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Sep 2016 21:09:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E2817E0252; Wed, 21 Sep 2016 21:09:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Wed, 21 Sep 2016 21:09:48 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/3] activemq-artemis git commit: ARTEMIS-740 Auto-reload diverts from broker.xml archived-at: Wed, 21 Sep 2016 21:09:50 -0000 Repository: activemq-artemis Updated Branches: refs/heads/master df0d5d71e -> 5ea53c48e ARTEMIS-740 Auto-reload diverts from broker.xml Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/589adbcc Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/589adbcc Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/589adbcc Branch: refs/heads/master Commit: 589adbccacb34aa0ff9c933ff5b240bb71dc5463 Parents: df0d5d7 Author: Ville Skyttä Authored: Wed Sep 21 12:13:31 2016 +0300 Committer: Clebert Suconic Committed: Wed Sep 21 17:00:21 2016 -0400 ---------------------------------------------------------------------- .../activemq/artemis/core/server/impl/ActiveMQServerImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/589adbcc/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java ---------------------------------------------------------------------- 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 7f67abc..38005ed 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 @@ -2451,6 +2451,12 @@ public class ActiveMQServerImpl implements ActiveMQServer { securityRepository.swap(config.getSecurityRoles().entrySet()); ActiveMQServerLogger.LOGGER.reloadingConfiguration("address settings"); addressSettingsRepository.swap(config.getAddressesSettings().entrySet()); + ActiveMQServerLogger.LOGGER.reloadingConfiguration("diverts"); + for (DivertConfiguration divertConfig : config.getDivertConfigurations()) { + if (postOffice.getBinding(new SimpleString(divertConfig.getName())) == null) { + deployDivert(divertConfig); + } + } } } }