[5/6] git commit: CAMEL-6740: System property org.apache.camel.jmx.createRmiConnector is ignored with spring xml. Thanks to Seiji Sogabe for the patch.

[davsclaus]

CAMEL-6740: System property org.apache.camel.jmx.createRmiConnector is ignored 
with spring xml. Thanks to Seiji Sogabe for the patch.

Conflicts:
        
camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4225d51f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4225d51f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4225d51f

Branch: refs/heads/camel-2.11.x
Commit: 4225d51ff252a1d15e2bd0d7e12ce1d15c277ce3
Parents: 93116d1
Author: Claus Ibsen <davscl...@apache.org>
Authored: Sat Sep 14 12:28:55 2013 +0200
Committer: Claus Ibsen <davscl...@apache.org>
Committed: Sat Sep 14 12:30: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/4225d51f/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 78fc97a..0402d1a 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
@@ -85,8 +85,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);
         }
@@ -112,13 +110,15 @@ 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);
         }
         if (System.getProperty(JmxSystemPropertyKeys.REGISTER_NEW_ROUTES) != 
null) {
             registerNewRoutes = 
Boolean.getBoolean(JmxSystemPropertyKeys.REGISTER_NEW_ROUTES);
         }
+        if (System.getProperty(JmxSystemPropertyKeys.CREATE_CONNECTOR) != 
null) {
+            createConnector = 
Boolean.getBoolean(JmxSystemPropertyKeys.CREATE_CONNECTOR);
+        }
     }
 
     public void setRegistryPort(Integer port) {