From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Wed, 2 Dec 2015 07:53:53 +0000 (+0100)
Subject: GenericJMX plugin: fix indentation/bracket error
X-Git-Tag: collectd-5.6.0~539
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=cfb1c97ca06d84415409a8c9a9b1665e43520756

GenericJMX plugin: fix indentation/bracket error

1e2ad9c0 contained a mistake which resulted in the following build
error. It seems to be a bad copy-paste when creating #1330 from the
patch in #1291.

```
./org/collectd/java/GenericJMXConfValue.java:535: error: variable tmp is already defined in constructor GenericJMXConfValue(OConfigItem)
          String tmp = getConfigString (child);
```
---

diff --git a/bindings/java/org/collectd/java/GenericJMXConfValue.java b/bindings/java/org/collectd/java/GenericJMXConfValue.java
index 802622c5..25b70d4a 100644
--- a/bindings/java/org/collectd/java/GenericJMXConfValue.java
+++ b/bindings/java/org/collectd/java/GenericJMXConfValue.java
@@ -530,12 +530,12 @@ class GenericJMXConfValue
         String tmp = getConfigString (child);
         if (tmp != null)
           this._instance_from.add (tmp);
-        else if (child.getKey ().equalsIgnoreCase ("PluginName"))
-        {
-          String tmp = getConfigString (child);
-          if (tmp != null)
-            this._plugin_name = tmp;
-        }
+      }
+      else if (child.getKey ().equalsIgnoreCase ("PluginName"))
+      {
+        String tmp = getConfigString (child);
+        if (tmp != null)
+          this._plugin_name = tmp;
       }
       else
         throw (new IllegalArgumentException ("Unknown option: "