diff options
author | Jorge Hernandez <jh1730@att.com> | 2017-08-15 15:23:59 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2017-08-15 15:23:59 +0000 |
commit | 6b20e15005866454f5cb8d528de0d03aa75f52e7 (patch) | |
tree | fbaa0746b373ae99dd9259b7e385e4082541e2a3 /integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/ComponentAdmin.java | |
parent | 3b6aa335624dbe14963c4dfa1d32ad0336141dc7 (diff) | |
parent | d1077082cafafdd275aa8e210cf5f430ec11934d (diff) |
Merge "Resolve major/critical issues in integrity-monitor"
Diffstat (limited to 'integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/ComponentAdmin.java')
-rw-r--r-- | integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/ComponentAdmin.java | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/ComponentAdmin.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/ComponentAdmin.java index 551e1b09..8ffb1b74 100644 --- a/integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/ComponentAdmin.java +++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/ComponentAdmin.java @@ -86,14 +86,13 @@ public class ComponentAdmin implements ComponentAdminMBean { MBeanRegistrationException, InstanceNotFoundException, InstanceAlreadyExistsException, NotCompliantMBeanException { - //if (LOGGER.isDebugEnabled()) { + logger.info("Registering " + name + " MBean"); - //} + MBeanServer mbeanServer = findMBeanServer(); if (mbeanServer == null) { - //LOGGER.warn("No MBeanServer to register " + name + " MBean"); return; } @@ -130,9 +129,6 @@ public class ComponentAdmin implements ComponentAdminMBean { return; } - //if (LOGGER.isDebugEnabled()) { - //LOGGER.debug("Unregistering " + name + " MBean"); - //} registeredMBeanServer.unregisterMBean(registeredObjectName); registeredMBeanServer = null; @@ -142,6 +138,7 @@ public class ComponentAdmin implements ComponentAdminMBean { /** * {@inheritDoc} */ + @Override public String toString() { return ComponentAdmin.class.getSimpleName() + "[" + name + "]"; } @@ -155,11 +152,11 @@ public class ComponentAdmin implements ComponentAdminMBean { MBeanServerFactory.findMBeanServer(null); Iterator<MBeanServer> iter = mbeanServers.iterator(); - MBeanServer mbeanServer = null; + MBeanServer mbeanServer; while (iter.hasNext()) { mbeanServer = iter.next(); - if (mbeanServer.getDefaultDomain().equals("DefaultDomain")) { + if ("DefaultDomain".equals(mbeanServer.getDefaultDomain())) { return mbeanServer; } } |