You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/09/14 12:31:24 UTC
[4/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/d4531f8e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d4531f8e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d4531f8e
Branch: refs/heads/camel-2.12.x
Commit: d4531f8e290cee69f29c6af208f3f8475f5062ea
Parents: ccb855f
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Sep 14 12:28:55 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Sep 14 12:29:20 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/d4531f8e/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) {