diff --git a/bindings/java/org/collectd/java/GenericJMXConfConnection.java b/bindings/java/org/collectd/java/GenericJMXConfConnection.java
index 0c81bc9ad941760f07021530d6663f32ee34b75f..186d14468bc9c04ef098db414e9663842fe1e38a 100644 (file)
/*
* collectd/java - org/collectd/java/GenericJMXConfConnection.java
- * Copyright (C) 2009,2010 Florian octo Forster
+ * Copyright (C) 2009-2012 Florian octo Forster
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* Authors:
- * Florian octo Forster <octo at verplant.org>
+ * Florian octo Forster <octo at collectd.org>
*/
package org.collectd.java;
import java.util.Iterator;
import java.util.ArrayList;
import java.util.HashMap;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
return (v.getString ());
} /* }}} String getConfigString */
+ private String getHost () /* {{{ */
+ {
+ if (this._host != null)
+ {
+ return (this._host);
+ }
+
+ return Collectd.getHostname();
+ } /* }}} String getHost */
+
private void connect () /* {{{ */
{
JMXServiceURL service_url;
environment = new HashMap ();
environment.put (JMXConnector.CREDENTIALS, credentials);
+ environment.put(JMXConnectorFactory.PROTOCOL_PROVIDER_CLASS_LOADER, this.getClass().getClassLoader());
}
try
+ ((this._host != null) ? this._host : "(null)"));
pd = new PluginData ();
- pd.setHost ((this._host != null) ? this._host : "localhost");
+ pd.setHost (this.getHost ());
pd.setPlugin ("GenericJMX");
for (int i = 0; i < this._mbeans.size (); i++)