summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9c44602)
raw | patch | inline | side by side (parent: 9c44602)
author | Marc Fournier <marc.fournier@camptocamp.com> | |
Wed, 2 Dec 2015 07:53:53 +0000 (08:53 +0100) | ||
committer | Marc Fournier <marc.fournier@camptocamp.com> | |
Wed, 2 Dec 2015 07:58:28 +0000 (08:58 +0100) |
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);
```
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);
```
bindings/java/org/collectd/java/GenericJMXConfValue.java | patch | blob | history |
diff --git a/bindings/java/org/collectd/java/GenericJMXConfValue.java b/bindings/java/org/collectd/java/GenericJMXConfValue.java
index 802622c5ec7511c73ba2d27cbf2adbbf155b9df8..25b70d4ad7166dfda421f8b29fb37a757a837673 100644 (file)
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: "