You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2021/04/10 18:01:57 UTC
[jmeter] branch master updated: Hide splash screen when an error is
displayed
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 a75fc42 Hide splash screen when an error is displayed
a75fc42 is described below
commit a75fc427de8ce6ce80d3f39e955dda9c68d01483
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sat Apr 10 19:59:54 2021 +0200
Hide splash screen when an error is displayed
When the test plan could not be parsed on startup, the splash
screen would hide it. So close it.
Bugzilla Id: 65232
---
src/core/src/main/java/org/apache/jmeter/JMeter.java | 2 ++
xdocs/changes.xml | 1 +
2 files changed, 3 insertions(+)
diff --git a/src/core/src/main/java/org/apache/jmeter/JMeter.java b/src/core/src/main/java/org/apache/jmeter/JMeter.java
index 5bf66de..ea25835 100644
--- a/src/core/src/main/java/org/apache/jmeter/JMeter.java
+++ b/src/core/src/main/java/org/apache/jmeter/JMeter.java
@@ -427,9 +427,11 @@ public class JMeter implements JMeterPlugin {
Load.insertLoadedTree(1, tree);
} catch (ConversionException e) {
log.error("Failure loading test file", e);
+ splash.close();
JMeterUtils.reportErrorToUser(SaveService.CEtoString(e));
} catch (Exception e) {
log.error("Failure loading test file", e);
+ splash.close();
JMeterUtils.reportErrorToUser(e.toString());
}
} else {
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 7547653..7a87f9c 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -130,6 +130,7 @@ Summary
<li><pr>655</pr>Updated x-stream to 1.4.16 (from 1.4.15). Contributed by Stefan Seide (stefan @ trilobyte.se.de)</li>
<li><pr>656</pr>Updated json-smart to 2.4.1 (from 2.3) and accessors-smart to 1.3 (from 1.2). Contributed by Stefan Seide (stefan @ trilobyte.se.de)</li>
<li><bug>64831</bug>Log truststore entries in debug level for logger <code>org.apache.jmeter.util.keystore.JmeterKeyStore</code></li>
+ <li><bug>65232</bug>Hide splash screen when an error is displayed because the test plan could not be parsed.</li>
</ul>
<!-- =================== Bug fixes =================== -->