You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2016/10/20 18:41:52 UTC

[3/3] karaf git commit: [KARAF-3952] Be able to provide full ObjectName to registerMBean()

[KARAF-3952] Be able to provide full ObjectName to registerMBean()

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/54b57b70
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/54b57b70
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/54b57b70

Branch: refs/heads/master
Commit: 54b57b7017ba0a45a1041db18b3677c0da5770e5
Parents: ebae182
Author: Guillaume Nodet <gn...@apache.org>
Authored: Thu Oct 20 20:41:37 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Thu Oct 20 20:41:37 2016 +0200

----------------------------------------------------------------------
 .../org/apache/karaf/util/tracker/BaseActivator.java   | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/54b57b70/util/src/main/java/org/apache/karaf/util/tracker/BaseActivator.java
----------------------------------------------------------------------
diff --git a/util/src/main/java/org/apache/karaf/util/tracker/BaseActivator.java b/util/src/main/java/org/apache/karaf/util/tracker/BaseActivator.java
index d2c09e1..670ff9d 100644
--- a/util/src/main/java/org/apache/karaf/util/tracker/BaseActivator.java
+++ b/util/src/main/java/org/apache/karaf/util/tracker/BaseActivator.java
@@ -308,8 +308,19 @@ public class BaseActivator implements BundleActivator, Runnable {
      * @param type The MBean type to register.
      */
     protected void registerMBean(Object mbean, String type) {
+        String name = "org.apache.karaf:" + type + ",name=" + System.getProperty("karaf.name");
+        registerMBeanWithName(mbean, name);
+    }
+
+    /**
+     * Called in {@link #doStart()}.
+     *
+     * @param mbean The MBean to register.
+     * @param name The MBean name.
+     */
+    protected void registerMBeanWithName(Object mbean, String name) {
         Hashtable<String, Object> props = new Hashtable<>();
-        props.put("jmx.objectname", "org.apache.karaf:" + type + ",name=" + System.getProperty("karaf.name"));
+        props.put("jmx.objectname", name);
         trackRegistration(bundleContext.registerService(getInterfaceNames(mbean), mbean, props));
     }