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=fa0c52699a7b1242a13caec363c43af2483c34d7;hp=eafe760ddc1f029d3e9ea471282efd0693a62225;hb=refs%2Fchanges%2F73%2F46573%2F5;hpb=660c3e22ca97bc613ea6f6288503620bba6fb233 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 eafe760ddc..fa0c52699a 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 @@ -47,22 +47,24 @@ public interface ServiceReferenceRegistrator extends AutoCloseable { this.nullableTransactionName = nullableTransactionName; } + @Override public String getNullableTransactionName() { return nullableTransactionName; } + @Override public ServiceReferenceJMXRegistration registerMBean(ServiceReferenceMXBeanImpl object, ObjectName on) throws InstanceAlreadyExistsException { String actualTransactionName = ObjectNameUtil.getTransactionName(on); boolean broken = false; broken |= (nullableTransactionName == null) != (actualTransactionName == null); - broken |= (nullableTransactionName != null) && nullableTransactionName.equals(actualTransactionName) == false; + broken |= (nullableTransactionName != null) && !nullableTransactionName.equals(actualTransactionName); if (broken) { throw new IllegalArgumentException("Transaction name mismatch between expected " + nullableTransactionName + ", got " + actualTransactionName + " in " + on); } - if (ObjectNameUtil.isServiceReference(on) == false) { + if (!ObjectNameUtil.isServiceReference(on)) { throw new IllegalArgumentException("Invalid type of " + on); } return new ServiceReferenceJMXRegistration(currentJMXRegistrator.registerMBean(object, on)); @@ -94,6 +96,7 @@ public interface ServiceReferenceRegistrator extends AutoCloseable { this.nullableTransactionName = null; } + @Override public ServiceReferenceRegistrator create() { return new ServiceReferenceRegistratorImpl(parentRegistrator, nullableTransactionName); }