Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 90E44107F1 for ; Sat, 14 Sep 2013 10:31:43 +0000 (UTC) Received: (qmail 59697 invoked by uid 500); 14 Sep 2013 10:31:31 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 59546 invoked by uid 500); 14 Sep 2013 10:31:26 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 59448 invoked by uid 99); 14 Sep 2013 10:31:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Sep 2013 10:31:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E8D579046D4; Sat, 14 Sep 2013 10:31:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davsclaus@apache.org To: commits@camel.apache.org Date: Sat, 14 Sep 2013 10:31:22 -0000 Message-Id: In-Reply-To: <1462e1ae78cf4ce2b4f487dfb257282b@git.apache.org> References: <1462e1ae78cf4ce2b4f487dfb257282b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/6] git commit: CAMEL-6740: System property org.apache.camel.jmx.createRmiConnector is ignored with spring xml. Thanks to Seiji Sogabe for the patch. CAMEL-6740: System property org.apache.camel.jmx.createRmiConnector is ignored with spring xml. Thanks to Seiji Sogabe for the patch. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/655746a8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/655746a8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/655746a8 Branch: refs/heads/master Commit: 655746a8e86692669fa2dd234db4a1ecd7655f10 Parents: 05958ab Author: Claus Ibsen Authored: Sat Sep 14 12:28:55 2013 +0200 Committer: Claus Ibsen Committed: Sat Sep 14 12:28:55 2013 +0200 ---------------------------------------------------------------------- .../org/apache/camel/management/DefaultManagementAgent.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/655746a8/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java index 99c8e20..f134ae4 100644 --- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java +++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java @@ -86,8 +86,6 @@ public class DefaultManagementAgent extends ServiceSupport implements Management } protected void finalizeSettings() { - // TODO: System properties ought to take precedence, over configured options - if (registryPort == null) { registryPort = Integer.getInteger(JmxSystemPropertyKeys.REGISTRY_PORT, DEFAULT_REGISTRY_PORT); } @@ -113,7 +111,6 @@ public class DefaultManagementAgent extends ServiceSupport implements Management if (System.getProperty(JmxSystemPropertyKeys.USE_PLATFORM_MBS) != null) { usePlatformMBeanServer = Boolean.getBoolean(JmxSystemPropertyKeys.USE_PLATFORM_MBS); } - if (System.getProperty(JmxSystemPropertyKeys.REGISTER_ALWAYS) != null) { registerAlways = Boolean.getBoolean(JmxSystemPropertyKeys.REGISTER_ALWAYS); } @@ -123,6 +120,9 @@ public class DefaultManagementAgent extends ServiceSupport implements Management if (System.getProperty(JmxSystemPropertyKeys.MASK) != null) { mask = Boolean.getBoolean(JmxSystemPropertyKeys.MASK); } + if (System.getProperty(JmxSystemPropertyKeys.CREATE_CONNECTOR) != null) { + createConnector = Boolean.getBoolean(JmxSystemPropertyKeys.CREATE_CONNECTOR); + } } public void setRegistryPort(Integer port) {