BUG-4514: clean children in InternalJMXRegistrator

[controller.git] / opendaylight / config / config-manager / src / main / java / org / opendaylight / controller / config / manager / impl / jmx / BaseJMXRegistrator.java

diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/BaseJMXRegistrator.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/BaseJMXRegistrator.java
index 603c0f58a674dfe074c9e8b5f7ec255c0150620a..a4c69a090431eca6c5f07c65b482935a5af96471 100644 (file)
--- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/BaseJMXRegistrator.java
+++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/BaseJMXRegistrator.java
@@ -17,31 +17,27 @@ public class BaseJMXRegistrator implements AutoCloseable, NestableJMXRegistrator
 
     private final InternalJMXRegistrator internalJMXRegistrator;
 
-    public BaseJMXRegistrator(MBeanServer configMBeanServer) {
-        internalJMXRegistrator = new InternalJMXRegistrator(configMBeanServer);
+    public BaseJMXRegistrator(final MBeanServer configMBeanServer) {
+        internalJMXRegistrator = InternalJMXRegistrator.create(configMBeanServer);
     }
 
-    public BaseJMXRegistrator(InternalJMXRegistrator internalJMXRegistrator) {
+    public BaseJMXRegistrator(final InternalJMXRegistrator internalJMXRegistrator) {
         this.internalJMXRegistrator = internalJMXRegistrator;
     }
 
-    public TransactionJMXRegistrator createTransactionJMXRegistrator(
-            String transactionName) {
-        return new TransactionJMXRegistrator(
-                internalJMXRegistrator.createChild(), transactionName);
+    public TransactionJMXRegistrator createTransactionJMXRegistrator(final String transactionName) {
+        return new TransactionJMXRegistrator(internalJMXRegistrator.createChild(), transactionName);
     }
 
     public ModuleJMXRegistrator createModuleJMXRegistrator() {
         return new ModuleJMXRegistrator(internalJMXRegistrator.createChild());
     }
 
-    public RootRuntimeBeanRegistratorImpl createRuntimeBeanRegistrator(
-            ModuleIdentifier moduleIdentifier) {
-        return new RootRuntimeBeanRegistratorImpl(internalJMXRegistrator.createChild(),
-                moduleIdentifier);
+    public RootRuntimeBeanRegistratorImpl createRuntimeBeanRegistrator(final ModuleIdentifier moduleIdentifier) {
+        return new RootRuntimeBeanRegistratorImpl(internalJMXRegistrator.createChild(), moduleIdentifier);
     }
 
-    public Set<ObjectName> queryNames(ObjectName name, QueryExp query) {
+    public Set<ObjectName> queryNames(final ObjectName name, final QueryExp query) {
         return internalJMXRegistrator.queryNames(name, query);
     }