[jmeter] branch master updated: Don't use toString on format parameters and correct number of placeholders

[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 cf32f8e  Don't use toString on format parameters and correct number of 
placeholders
cf32f8e is described below

commit cf32f8eaf83363d2a46c798f17b4d44b7c985da5
Author: Felix Schumacher <felix.schumac...@internetallee.de>
AuthorDate: Sun Aug 9 12:07:38 2020 +0200

    Don't use toString on format parameters and correct number of placeholders
---
 .../java/org/apache/jmeter/gui/action/HtmlReportGenerator.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java 
b/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
index 41cf95f..6e8ef64 100644
--- 
a/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
+++ 
b/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
@@ -89,13 +89,13 @@ public class HtmlReportGenerator {
             }
         } catch (TimeoutException e) {
             
errorMessageList.add(MessageFormat.format(JMeterUtils.getResString("generate_report_ui.html_report_timeout_error"),
-                    COMMAND_TIMEOUT, e.getMessage(), 
commandExecutionOutput.toString()));
-            LOGGER.error("Report generation took more time than configured 
timeout(Property {}={})",
-                    "generate_report_ui.generation_timeout", COMMAND_TIMEOUT, 
commandExecutionOutput.toString(), e);
+                    COMMAND_TIMEOUT, e.getMessage(), commandExecutionOutput));
+            LOGGER.error("Report generation took more time than configured 
timeout (Property {}={}, command output=[{}])",
+                    "generate_report_ui.generation_timeout", COMMAND_TIMEOUT, 
commandExecutionOutput, e);
         } catch (InterruptedException | IOException e) {
             
errorMessageList.add(MessageFormat.format(JMeterUtils.getResString("generate_report_ui.html_report_unknown_error"),
                     e.getMessage(), commandExecutionOutput.toString()));
-            LOGGER.error("Error during HTML report generation, executing {}", 
commandExecutionOutput.toString(), e);
+            LOGGER.error("Error during HTML report generation, executing {}", 
commandExecutionOutput, e);
             if (e instanceof InterruptedException) {
                 Thread.currentThread().interrupt();
             }