X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2Fjmx%2FTransactionJMXRegistrator.java;h=ceba1c8905d95f048e74fa6528aba37dbcad9cd9;hb=6227570f6482136b72a26675d43c8bb88279503e;hp=6fd2a2fc65201ea0d48c974875e2fe9477300ac0;hpb=2c146f582dee58e36dc22505b4c6bedb4641342f;p=controller.git

diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/TransactionJMXRegistrator.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/TransactionJMXRegistrator.java
index 6fd2a2fc65..ceba1c8905 100644
--- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/TransactionJMXRegistrator.java
+++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/TransactionJMXRegistrator.java
@@ -7,14 +7,13 @@
  */
 package org.opendaylight.controller.config.manager.impl.jmx;
 
-import org.opendaylight.controller.config.api.jmx.ObjectNameUtil;
-import org.opendaylight.controller.config.manager.impl.jmx.InternalJMXRegistrator.InternalJMXRegistration;
-
+import com.google.common.base.Preconditions;
+import java.io.Closeable;
+import java.util.Set;
 import javax.management.InstanceAlreadyExistsException;
 import javax.management.ObjectName;
 import javax.management.QueryExp;
-import java.io.Closeable;
-import java.util.Set;
+import org.opendaylight.controller.config.api.jmx.ObjectNameUtil;
 
 /**
  * Contains constraints on passed {@link ObjectName} parameters. Only allow (un)
@@ -24,16 +23,16 @@ public class TransactionJMXRegistrator implements Closeable {
     private final InternalJMXRegistrator childJMXRegistrator;
     private final String transactionName;
 
-    TransactionJMXRegistrator(InternalJMXRegistrator internalJMXRegistrator,
-                              String transactionName) {
-        this.childJMXRegistrator = internalJMXRegistrator.createChild();
+    TransactionJMXRegistrator(final InternalJMXRegistrator internalJMXRegistrator,
+                              final String transactionName) {
+        this.childJMXRegistrator = Preconditions.checkNotNull(internalJMXRegistrator);
         this.transactionName = transactionName;
     }
 
     public static class TransactionJMXRegistration implements AutoCloseable {
         private final InternalJMXRegistration registration;
 
-        TransactionJMXRegistration(InternalJMXRegistration registration) {
+        TransactionJMXRegistration(final InternalJMXRegistration registration) {
             this.registration = registration;
         }
 
@@ -43,7 +42,7 @@ public class TransactionJMXRegistrator implements Closeable {
         }
     }
 
-    public TransactionJMXRegistration registerMBean(Object object, ObjectName on)
+    public TransactionJMXRegistration registerMBean(final Object object, final ObjectName on)
             throws InstanceAlreadyExistsException {
         if (!transactionName.equals(ObjectNameUtil.getTransactionName(on))) {
             throw new IllegalArgumentException(
@@ -55,7 +54,7 @@ public class TransactionJMXRegistrator implements Closeable {
                 childJMXRegistrator.registerMBean(object, on));
     }
 
-    public Set<ObjectName> queryNames(ObjectName name, QueryExp query) {
+    public Set<ObjectName> queryNames(final ObjectName name, final QueryExp query) {
         return childJMXRegistrator.queryNames(name, query);
     }
 
@@ -65,7 +64,8 @@ public class TransactionJMXRegistrator implements Closeable {
     }
 
     @Override
-    public void close() { // closes also all child TransactionModuleJMXRegistrator instances
+    public void close() {
+        // closes also all child TransactionModuleJMXRegistrator instances
         childJMXRegistrator.close();
     }
 }