svn commit: r1326531 - /camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java

[davsclaus]

Author: davsclaus
Date: Mon Apr 16 08:29:54 2012
New Revision: 1326531

URL: http://svn.apache.org/viewvc?rev=1326531&view=rev
Log:
Polished

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

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java?rev=1326531&r1=1326530&r2=1326531&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementAgent.java
 Mon Apr 16 08:29:54 2012
@@ -242,7 +242,7 @@ public class DefaultManagementAgent exte
     public void unregister(ObjectName name) throws JMException {
         if (server.isRegistered(name)) {
             server.unregisterMBean(name);
-            LOG.debug("Unregistered MBean with objectname: {}", name);
+            LOG.debug("Unregistered MBean with ObjectName: {}", name);
         }
         mbeansRegistered.remove(name);
     }
@@ -305,25 +305,25 @@ public class DefaultManagementAgent exte
         boolean exists = server.isRegistered(name);
         if (exists) {
             if (forceRegistration) {
-                LOG.info("ForceRegistration enabled, unregistering existing 
MBean");
+                LOG.info("ForceRegistration enabled, unregistering existing 
MBean with ObjectName: {}", name);
                 server.unregisterMBean(name);
             } else {
                 // okay ignore we do not want to force it and it could be a 
shared instance
-                LOG.debug("MBean already registered with objectname: {}", 
name);
+                LOG.debug("MBean already registered with ObjectName: {}", 
name);
             }
         }
 
         // register bean if by force or not exists
         ObjectInstance instance = null;
         if (forceRegistration || !exists) {
-            LOG.trace("Registering MBean with objectname: {}", name);
+            LOG.trace("Registering MBean with ObjectName: {}", name);
             instance = server.registerMBean(obj, name);
         }
 
+        // need to use the name returned from the server as some JEE servers 
may modify the name
         if (instance != null) {
             ObjectName registeredName = instance.getObjectName();
-            LOG.debug("Registered MBean with objectname: {}", registeredName);
-
+            LOG.debug("Registered MBean with ObjectName: {}", registeredName);
             mbeansRegistered.add(registeredName);
         }
     }
@@ -390,7 +390,6 @@ public class DefaultManagementAgent exte
         ObjectHelper.notEmpty(serviceUrlPath, "serviceUrlPath");
         ObjectHelper.notNull(registryPort, "registryPort");
 
-
         try {
             LocateRegistry.createRegistry(registryPort);
             LOG.debug("Created JMXConnector RMI registry on port {}", 
registryPort);