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
commit 2d8e630039afd439ca852cc705cc6f666184e899 Author: Felix Schumacher <[email protected]> AuthorDate: Thu Aug 1 20:53:45 2019 +0200 Spacepolice Don't squash the exception cause directly to our own message. --- src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java | 2 +- test/src/org/apache/jmeter/gui/action/HtmlReportGeneratorSpec.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java b/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java index 3c32b7d..ecf1287 100644 --- a/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java +++ b/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java @@ -244,7 +244,7 @@ public class ReportGenerator { try { source.run(); // NOSONAR } catch (SampleException ex) { - throw new GenerationException("Error while processing samples:"+ex.getMessage(), ex); + throw new GenerationException("Error while processing samples: " + ex.getMessage(), ex); } log.debug("End of samples processing"); diff --git a/test/src/org/apache/jmeter/gui/action/HtmlReportGeneratorSpec.groovy b/test/src/org/apache/jmeter/gui/action/HtmlReportGeneratorSpec.groovy index da87499..9263156 100644 --- a/test/src/org/apache/jmeter/gui/action/HtmlReportGeneratorSpec.groovy +++ b/test/src/org/apache/jmeter/gui/action/HtmlReportGeneratorSpec.groovy @@ -127,7 +127,7 @@ class HtmlReportGeneratorSpec extends JMeterSpec{ List<String> resultList = htmlReportGenerator.run() then: testDirectory.list().length == 0 - resultList.get(0).contains("An error occurred: Error while processing samples:Consumer failed with message") + resultList.get(0).contains("An error occurred: Error while processing samples: Consumer failed with message") cleanup: if(testDirectory.exists()) { if (testDirectory.list().length>0) {
