Merge pull request #13 from newbrough/bugfix/config-allenabled

Bugfix/config allenabled
worstcase · May 31, 2016 · 1cfd943 · 1cfd943
2 parents 2b2fd52 + cf99680
commit 1cfd943
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/gumshoe-probes/src/main/java/com/dell/gumshoe/Probe.java b/gumshoe-probes/src/main/java/com/dell/gumshoe/Probe.java
@@ -67,9 +67,13 @@ protected static String[] getList(Properties p, String key) {
         return out;
     }
 
+    protected static String getMBeanName(Configuration p) {
+        return p.getProperty("mean.name");
+    }
+
     protected static String getMBeanName(Configuration p, Class clazz) {
-        final String packageName = clazz==null ? null : clazz.getPackage().getName();
-        final String className = clazz==null ? null : clazz.getSimpleName();
+        final String packageName = clazz.getPackage().getName();
+        final String className = clazz.getSimpleName();
         return p.getProperty("mbean.name", packageName + ":type=" + className);
     }
 

diff --git a/gumshoe-probes/src/main/java/com/dell/gumshoe/io/IOProbe.java b/gumshoe-probes/src/main/java/com/dell/gumshoe/io/IOProbe.java
@@ -44,7 +44,7 @@ public void initialize(Configuration cfg) throws Exception {
 
         // jmx enabled if explicit name, explicit property, or some reporting enabled
         final boolean jmxEnabled =
-                getMBeanName(cfg, null)!=null || cfg.isTrue("mbean", reportEnabled);
+                getMBeanName(cfg)!=null || cfg.isTrue("mbean", reportEnabled);
         final String mbeanName = jmxEnabled ? getMBeanName(cfg, getClass()) : null;
 
         final boolean enabled = cfg.isTrue("enabled", reportEnabled || jmxEnabled);

diff --git a/gumshoe-probes/src/main/java/com/dell/gumshoe/network/UnclosedSocketProbe.java b/gumshoe-probes/src/main/java/com/dell/gumshoe/network/UnclosedSocketProbe.java
@@ -34,7 +34,7 @@ public void initialize(Configuration cfg) throws Exception {
 
         // jmx enabled if explicit name, explicit property, or some reporting enabled
         final boolean jmxEnabled =
-                getMBeanName(cfg, null)!=null || cfg.isTrue("mbean", reportEnabled);
+                getMBeanName(cfg)!=null || cfg.isTrue("mbean", reportEnabled);
         final String mbeanName = jmxEnabled ? getMBeanName(cfg, getClass()) : null;
 
         final boolean enabled = cfg.isTrue("enabled", reportEnabled || jmxEnabled);

diff --git a/gumshoe-probes/src/main/java/com/dell/gumshoe/thread/ProcessorProbe.java b/gumshoe-probes/src/main/java/com/dell/gumshoe/thread/ProcessorProbe.java
@@ -36,7 +36,7 @@ public void initialize(Configuration cfg) throws Exception {
 
         // jmx enabled if explicit name, explicit property, or some reporting enabled
         final boolean jmxEnabled =
-                getMBeanName(cfg, null)!=null || cfg.isTrue("mbean", reportEnabled);
+                getMBeanName(cfg)!=null || cfg.isTrue("mbean", reportEnabled);
         final String mbeanName = jmxEnabled ? getMBeanName(cfg, getClass()) : null;
 
         final boolean enabled = cfg.isTrue("enabled", reportEnabled || jmxEnabled);

diff --git a/gumshoe-tools/src/main/java/com/dell/gumshoe/inspector/tools/ReportFileChooser.java b/gumshoe-tools/src/main/java/com/dell/gumshoe/inspector/tools/ReportFileChooser.java
@@ -127,7 +127,7 @@ public void done() {
                 if(report!=null) {
                     final Date time = parser.getReportTime();
                     final String reportTime = hms.format(time);
-                    relayStats(parser.getFilename(), parser.getReportType(), reportTime, report);
+                    relayStats(parser.getFilename(), reportTime, parser.getReportType(), report);
                 }
             } catch(Exception ex) {
                 notifyError("Parse error reading file");