Forgot to close the JMXConnectors...

PRTG · Dec 17, 2014 · 98c8de5 · 98c8de5
1 parent fc867ff
commit 98c8de5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/com/paessler/prtg/jmx/sensors/CustomJMXSensor.java b/src/com/paessler/prtg/jmx/sensors/CustomJMXSensor.java
@@ -64,13 +64,14 @@ public DataResponse go() {
         if (attributeList == null)
             return null;
         DataResponse response = null;
+        JMXConnector jmxc = null;
         try {
             response = new DataResponse(sensorId, mBean);
             String[] creds = {rmiUsername, rmiPassword};
             Map env = new HashMap<String, String[]>();
             env.put(JMXConnector.CREDENTIALS, creds);
             JMXServiceURL serviceURL = new JMXServiceURL(rmiString);
-            JMXConnector jmxc = JMXConnectorFactory.connect(serviceURL, env);
+            jmxc = JMXConnectorFactory.connect(serviceURL, env);
             MBeanServerConnection mbsc = jmxc.getMBeanServerConnection();
             ObjectName bean = new ObjectName(mBean);
 
@@ -103,6 +104,14 @@ public DataResponse go() {
             error.setError("Exception");
             error.setMessage(e.getMessage() + " (Service URL: " + rmiString + ")");
             response = error;
+        } finally {
+            if (jmxc != null) {
+                try {
+                    jmxc.close();
+                } catch (Exception e) {
+                    // Ignore
+                }
+            }
         }
         return response;
     }

diff --git a/src/com/paessler/prtg/jmx/sensors/VMHealthSensor.java b/src/com/paessler/prtg/jmx/sensors/VMHealthSensor.java
@@ -50,14 +50,14 @@ public class VMHealthSensor extends Sensor {
     @Override
     public DataResponse go() {
         DataResponse response = null;
-
+        JMXConnector jmxc = null;
         try {
             String[] creds = {rmiUsername, rmiPassword};
             Map env = new HashMap<String, String[]>();
             env.put(JMXConnector.CREDENTIALS, creds);
             JMXServiceURL serviceURL = new JMXServiceURL(rmiString);
 
-            JMXConnector jmxc = JMXConnectorFactory.connect(serviceURL, env);
+            jmxc = JMXConnectorFactory.connect(serviceURL, env);
             MBeanServerConnection mbsc = jmxc.getMBeanServerConnection();
             ObjectName memoryBeanName = new ObjectName("java.lang:type=Memory");
             CompositeData heapMemoryUsage = (CompositeData) mbsc.getAttribute(memoryBeanName, "HeapMemoryUsage");
@@ -111,6 +111,14 @@ public DataResponse go() {
             error.setError("Exception");
             error.setMessage(e.getMessage() + " (Service URL: " + rmiString + ")");
             response = error;
+        } finally {
+            if (jmxc != null) {
+                try {
+                    jmxc.close();
+                } catch (Exception e) {
+                    // Ignore
+                }
+            }
         }
 
         return response;