From: Florian Forster <github@nospam.verplant.org>
Date: Wed, 18 Jan 2012 15:17:47 +0000 (-0800)
Subject: Merge pull request #16 from pyr/master
X-Git-Tag: collectd-5.1.0~46
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=e770968a686963a3c8373cd6cd38b13964433029;hp=da193ed2803653fb2a06d70d64dd7568e8399cb8;p=collectd.git

Merge pull request #16 from pyr/master

GenericJMX plugin: Allow attribute to call operations.
---

diff --git a/bindings/java/org/collectd/java/GenericJMXConfValue.java b/bindings/java/org/collectd/java/GenericJMXConfValue.java
index 0eb0d5f8..9fb0fc2e 100644
--- a/bindings/java/org/collectd/java/GenericJMXConfValue.java
+++ b/bindings/java/org/collectd/java/GenericJMXConfValue.java
@@ -312,7 +312,14 @@ class GenericJMXConfValue
 
     try
     {
-      value = conn.getAttribute (objName, key);
+      try
+      {
+        value = conn.getAttribute (objName, key);
+      }
+      catch (javax.management.AttributeNotFoundException e)
+      {
+        value = conn.invoke (objName, key, /* args = */ null, /* types = */ null);
+      }
     }
     catch (Exception e)
     {