diff options
Diffstat (limited to 'integrity-monitor/src/main/java/org/onap/policy/common/im/jmx')
-rw-r--r-- | integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/ComponentAdmin.java | 13 | ||||
-rw-r--r-- | integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/JmxAgentConnection.java | 10 |
2 files changed, 6 insertions, 17 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; } } diff --git a/integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/JmxAgentConnection.java b/integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/JmxAgentConnection.java index 7a7e9a80..9b9bc48c 100644 --- a/integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/JmxAgentConnection.java +++ b/integrity-monitor/src/main/java/org/onap/policy/common/im/jmx/JmxAgentConnection.java @@ -47,17 +47,10 @@ public final class JmxAgentConnection { private JMXConnector connector; private String jmxUrl = null; - //private final static Logger Log = Logger.getLogger(JmxAgentConnection.class); - /** * Set up the host/port from the properties. Use defaults if missing from the properties. * @param properties the properties used to look for host and port */ - //JmxAgentConnection(Properties properties) { - //host = properties.getProperty("jmxAgent.host", DEFAULT_HOST); - //port = properties.getProperty("jmxAgent.port", DEFAULT_PORT); - //} - public JmxAgentConnection() { host = DEFAULT_HOST; port = DEFAULT_PORT; @@ -98,7 +91,7 @@ public final class JmxAgentConnection { else { url = new JMXServiceURL(jmxUrl); } - Map<String, Object> env = new HashMap<String, Object>(); + Map<String, Object> env = new HashMap<>(); connector = JMXConnectorFactory.newJMXConnector(url, env); connector.connect(); @@ -110,7 +103,6 @@ public final class JmxAgentConnection { Notification notification, Object handback) { if (notification.getType().equals( JMXConnectionNotification.FAILED)) { - //Log.debug("JMXAgent connection failure"); // handle disconnect disconnect(); } |