You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/08/27 22:04:02 UTC

svn commit: r1758080 - in /jmeter/trunk: src/core/org/apache/jmeter/JMeter.java xdocs/changes.xml

Author: pmouawad
Date: Sat Aug 27 22:04:02 2016
New Revision: 1758080

URL: http://svn.apache.org/viewvc?rev=1758080&view=rev
Log:
Bug 60053 - In Non GUI mode, a Stacktrace is shown at end of test while report is being generated
Bugzilla Id: 60053

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1758080&r1=1758079&r2=1758080&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Sat Aug 27 22:04:02 2016
@@ -1083,13 +1083,13 @@ public class JMeter implements JMeterPlu
         public void testEnded() {
             long now = System.currentTimeMillis();
             println("Tidying up ...    @ "+new Date(now)+" ("+now+")");
-            checkForRemainingThreads();
             try {
                 generateReport();
             } catch (Exception e) {
                 System.err.println("Error generating the report: "+e);
                 log.error("Error generating the report",e);
             }
+            checkForRemainingThreads();
             println("... end of run");
         }
 
@@ -1128,9 +1128,14 @@ public class JMeter implements JMeterPlu
             } catch (InterruptedException ignored) {
             }
             ClientJMeterEngine.tidyRMI(log);
-            println("... end of run");
-            generateReport();
+            try {
+                generateReport();
+            } catch (Exception e) {
+                System.err.println("Error generating the report: "+e);
+                log.error("Error generating the report",e);
+            }
             checkForRemainingThreads();
+            println("... end of run");
         }
 
         /**

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1758080&r1=1758079&r2=1758080&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Aug 27 22:04:02 2016
@@ -198,6 +198,7 @@ Summary
     <li><bug>59723</bug>Use jmeter.properties for testing whenever possible</li>
     <li><bug>59726</bug>Unit test to check that CSV header text and sample format don't change unexpectedly</li>
     <li><bug>59889</bug>Change encoding to UTF-8 in reports for dashboard.</li>
+    <li><bug>60053</bug>In Non GUI mode, a Stacktrace is shown at end of test while report is being generated</li>
 </ul>
 
  <!--  =================== Thanks =================== -->