svn commit: r1732948 - /jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java

[pm...@apache.org]

Author: pmouawad
Date: Mon Feb 29 21:18:55 2016
New Revision: 1732948

URL: http://svn.apache.org/viewvc?rev=1732948&view=rev
Log:
Bug 58986 - Report/Dashboard reuses the same output directory
Take into account sebb note on dev mailing list:
"- The precedence is wrong; command line options should always override property definitions."
Bugzilla Id: 58986

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java?rev=1732948&r1=1732947&r2=1732948&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java Mon Feb 29 21:18:55 2016
@@ -349,8 +349,13 @@ public class HtmlTemplateExporter extend
 
         // Get output directory property value
         File outputDir = getPropertyFromConfig(exportCfg, OUTPUT_DIR,
-                getReportOutputFolder(), File.class);
-        LOG.info("Will generate dashboard in folder:" + outputDir);
+                new File(JMeterUtils.getJMeterBinDir(), OUTPUT_DIR_NAME_DEFAULT), File.class);
+        String globallyDefinedOutputDir = JMeterUtils.getProperty(JMeter.JMETER_REPORT_OUTPUT_DIR_PROPERTY);
+        if(!StringUtils.isEmpty(globallyDefinedOutputDir)) {
+            outputDir = new File(globallyDefinedOutputDir);
+        }
+
+        LOG.info("Will generate dashboard in folder:" + outputDir.getAbsolutePath());
 
         // Add the flag defining whether only sample series are filtered to the
         // context