You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/07/15 11:08:39 UTC
karaf-decanter git commit: [KARAF-3855] Close remote JMX connection
once the harvesting has been done
Repository: karaf-decanter
Updated Branches:
refs/heads/master fde1cfad1 -> 68451c820
[KARAF-3855] Close remote JMX connection once the harvesting has been done
Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/68451c82
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/68451c82
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/68451c82
Branch: refs/heads/master
Commit: 68451c820acd8cb45f9a68462cac11f9e1571a86
Parents: fde1cfa
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Jul 15 11:08:00 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Jul 15 11:08:00 2015 +0200
----------------------------------------------------------------------
.../apache/karaf/decanter/collector/jmx/JmxCollector.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/68451c82/collector/jmx/src/main/java/org/apache/karaf/decanter/collector/jmx/JmxCollector.java
----------------------------------------------------------------------
diff --git a/collector/jmx/src/main/java/org/apache/karaf/decanter/collector/jmx/JmxCollector.java b/collector/jmx/src/main/java/org/apache/karaf/decanter/collector/jmx/JmxCollector.java
index f4040fa..ec58a4e 100644
--- a/collector/jmx/src/main/java/org/apache/karaf/decanter/collector/jmx/JmxCollector.java
+++ b/collector/jmx/src/main/java/org/apache/karaf/decanter/collector/jmx/JmxCollector.java
@@ -60,6 +60,7 @@ public class JmxCollector implements Runnable {
public void run() {
LOGGER.debug("Karaf Decanter JMX Collector starts harvesting {}...", type);
+ JMXConnector connector = null;
MBeanServerConnection connection = null;
if (url == null || url.equalsIgnoreCase("local")) {
@@ -78,7 +79,6 @@ public class JmxCollector implements Runnable {
HashMap env = new HashMap();
String[] credentials = list.toArray(new String[list.size()]);
env.put(JMXConnector.CREDENTIALS, credentials);
- JMXConnector connector;
if (credentials.length > 0) {
connector = JMXConnectorFactory.connect(jmxServiceURL, env);
} else {
@@ -114,6 +114,14 @@ public class JmxCollector implements Runnable {
LOGGER.debug("MBean connection is null, nothing to do");
}
+ if (connector != null) {
+ try {
+ connector.close();
+ } catch (Exception e) {
+ LOGGER.trace("Can't close JMX connector", e);
+ }
+ }
+
LOGGER.debug("Karaf Decanter JMX Collector harvesting {} done", type);
}