X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2Fjmx%2FServiceReferenceRegistrator.java;h=5dc3fe2ecaa80f70e93f1c39e4e0e211dda6f6eb;hp=e9db0715e5758f239bc2cffa397e5846f5a3e1cd;hb=f43b01b81319959b1907e3e04537f5169e7f33d8;hpb=cbcc2b61265e903959f11d44c292771e76b3926e

diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/ServiceReferenceRegistrator.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/ServiceReferenceRegistrator.java
index e9db0715e5..5dc3fe2eca 100644
--- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/ServiceReferenceRegistrator.java
+++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/jmx/ServiceReferenceRegistrator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2013, 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -15,8 +15,8 @@ public interface ServiceReferenceRegistrator extends AutoCloseable {
 
     String getNullableTransactionName();
 
-    ServiceReferenceJMXRegistration registerMBean(ServiceReferenceMXBeanImpl object,
-                                                          ObjectName on) throws InstanceAlreadyExistsException;
+    ServiceReferenceJMXRegistration registerMBean(ServiceReferenceMXBeanImpl object, ObjectName on)
+            throws InstanceAlreadyExistsException;
 
     @Override
     void close();
@@ -42,7 +42,8 @@ public interface ServiceReferenceRegistrator extends AutoCloseable {
         private final InternalJMXRegistrator currentJMXRegistrator;
         private final String nullableTransactionName;
 
-        public ServiceReferenceRegistratorImpl(final NestableJMXRegistrator parentRegistrator, final String nullableTransactionName){
+        public ServiceReferenceRegistratorImpl(final NestableJMXRegistrator parentRegistrator,
+                final String nullableTransactionName) {
             currentJMXRegistrator = parentRegistrator.createChild();
             this.nullableTransactionName = nullableTransactionName;
         }
@@ -52,14 +53,13 @@ public interface ServiceReferenceRegistrator extends AutoCloseable {
             return nullableTransactionName;
         }
 
-
         @Override
         public ServiceReferenceJMXRegistration registerMBean(final ServiceReferenceMXBeanImpl object,
-                                                             final ObjectName on) throws InstanceAlreadyExistsException {
+                final ObjectName on) throws InstanceAlreadyExistsException {
             String actualTransactionName = ObjectNameUtil.getTransactionName(on);
             boolean broken = false;
-            broken |= (nullableTransactionName == null) != (actualTransactionName == null);
-            broken |= (nullableTransactionName != null) && !nullableTransactionName.equals(actualTransactionName);
+            broken |= nullableTransactionName == null != (actualTransactionName == null);
+            broken |= nullableTransactionName != null && !nullableTransactionName.equals(actualTransactionName);
             if (broken) {
                 throw new IllegalArgumentException("Transaction name mismatch between expected "
                         + nullableTransactionName + ", got " + actualTransactionName + " in " + on);
@@ -70,23 +70,22 @@ public interface ServiceReferenceRegistrator extends AutoCloseable {
             return new ServiceReferenceJMXRegistration(currentJMXRegistrator.registerMBean(object, on));
         }
 
-
         @Override
         public void close() {
             currentJMXRegistrator.close();
         }
+
         public interface ServiceReferenceTransactionRegistratorFactory {
             ServiceReferenceRegistrator create();
         }
     }
 
-
     class ServiceReferenceTransactionRegistratorFactoryImpl implements ServiceReferenceTransactionRegistratorFactory {
         private final NestableJMXRegistrator parentRegistrator;
         private final String nullableTransactionName;
 
-        public ServiceReferenceTransactionRegistratorFactoryImpl(final TransactionModuleJMXRegistrator parentRegistrator,
-                                                             final String nullableTransactionName) {
+        public ServiceReferenceTransactionRegistratorFactoryImpl(
+                final TransactionModuleJMXRegistrator parentRegistrator, final String nullableTransactionName) {
             this.parentRegistrator = parentRegistrator;
             this.nullableTransactionName = nullableTransactionName;
         }