X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-common-util%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fcommon%2Futil%2Fjmx%2FAbstractMXBean.java;h=53d7a2f22a95b65d003a4a2d7e836bc100162143;hb=HEAD;hp=223132c95b066ca8307266168b872ca61280a9ca;hpb=fffb9f3d3bd7010d0c35ce75bdf8c58094a55256;p=controller.git diff --git a/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/md/sal/common/util/jmx/AbstractMXBean.java b/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/md/sal/common/util/jmx/AbstractMXBean.java index 223132c95b..53d7a2f22a 100644 --- a/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/md/sal/common/util/jmx/AbstractMXBean.java +++ b/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/md/sal/common/util/jmx/AbstractMXBean.java @@ -7,7 +7,6 @@ */ package org.opendaylight.controller.md.sal.common.util.jmx; -import com.google.common.annotations.Beta; import java.lang.management.ManagementFactory; import javax.management.InstanceAlreadyExistsException; import javax.management.InstanceNotFoundException; @@ -32,9 +31,7 @@ import org.slf4j.LoggerFactory; * * @author Thomas Pantelis */ -@Beta public abstract class AbstractMXBean { - private static final Logger LOG = LoggerFactory.getLogger(AbstractMXBean.class); public static final String BASE_JMX_PREFIX = "org.opendaylight.controller:"; @@ -89,7 +86,7 @@ public abstract class AbstractMXBean { boolean registered = false; try { // Object to identify MBean - final ObjectName mbeanName = this.getMBeanObjectName(); + final ObjectName mbeanName = getMBeanObjectName(); LOG.debug("Register MBean {}", mbeanName); @@ -129,16 +126,13 @@ public abstract class AbstractMXBean { * @return true is successfully unregistered, false otherwise. */ public boolean unregisterMBean() { - boolean unregister = false; try { - ObjectName mbeanName = this.getMBeanObjectName(); - unregisterMBean(mbeanName); - unregister = true; + unregisterMBean(getMBeanObjectName()); + return true; } catch (MBeanRegistrationException | InstanceNotFoundException | MalformedObjectNameException e) { LOG.debug("Failed when unregistering MBean", e); + return false; } - - return unregister; } private void unregisterMBean(ObjectName mbeanName) throws MBeanRegistrationException,