[jmeter] branch master updated: Log exeptions reported via JMeterUtils#reportToUser even when in GUI mode

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
     new 6e13c4d  Log exeptions reported via JMeterUtils#reportToUser even when 
in GUI mode
6e13c4d is described below

commit 6e13c4d2c7e352362621ee9f6f9b47e0a84d19c1
Author: Felix Schumacher <felix.schumac...@internetallee.de>
AuthorDate: Thu May 28 16:14:32 2020 +0200

    Log exeptions reported via JMeterUtils#reportToUser even when in GUI mode
    
    Bugzilla Id: 64440
---
 src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java | 10 +++++-----
 xdocs/changes.xml                                              |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java 
b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
index 2f6360a..0e350a2 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
@@ -875,13 +875,13 @@ public class JMeterUtils implements UnitTestManager {
             errorMsg = "Unknown error - see log file";
             log.warn("Unknown error", new Throwable("errorMsg == null"));
         }
+        if (exception != null) {
+            log.error(errorMsg, exception);
+        } else {
+            log.error(errorMsg);
+        }
         GuiPackage instance = GuiPackage.getInstance();
         if (instance == null) {
-            if(exception != null) {
-                log.error(errorMsg, exception);
-            } else {
-                log.error(errorMsg);
-            }
             System.out.println(errorMsg); // NOSONAR intentional
             return; // Done
         }
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index cf38d72..aec4ea5 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -115,6 +115,7 @@ Summary
 <ul>
     <li><pr>594</pr>Updated neo4j-java-driver to 4.0.1 (from 1.7.5)</li>
     <li><bug>64454</bug>More precise error message, when no datasource value 
can be found in JDBC sampler</li>
+    <li><bug>64440</bug>Log exeptions reported via 
<code>JMeterUtils#reportToUser</code> even when in GUI mode</li>
 </ul>
 
  <!-- =================== Bug fixes =================== -->