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 2022/07/09 12:15:36 UTC

[jmeter] 02/02: Don't generate same string twice.

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 8d53bb9491c629696b48b233605b3d70036f611a
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sat Jul 9 14:15:11 2022 +0200

    Don't generate same string twice.
---
 .../org/apache/jmeter/report/core/CsvSampleReader.java   | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleReader.java b/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleReader.java
index 97508d58b5..86b134c805 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleReader.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/core/CsvSampleReader.java
@@ -150,18 +150,14 @@ public class CsvSampleReader implements Closeable{
                     && CSVSaveService.getSampleSaveConfiguration(
                             line, file.getAbsolutePath()) == null) {
                 // Build metadata from default save config
-                if (log.isWarnEnabled()) {
-                    log.warn(
-                            "File '{}' does not contain the field names header, "
-                                    + "ensure the jmeter.save.saveservice.* properties are the same "
-                                    + "as when the CSV file was created or the file may be read incorrectly "
-                                    + "when generating report",
-                            file.getAbsolutePath());
-                }
-                System.out.println("File '"+file.getAbsolutePath()+"' does not contain the field names header, "
+                String warnMessage = "File '" + file.getAbsolutePath() + "' does not contain the field names header, "
                         + "ensure the jmeter.save.saveservice.* properties are the same "
                         + "as when the CSV file was created or the file may be read incorrectly "
-                        + "when generating report");
+                        + "when generating report";
+                if (log.isWarnEnabled()) {
+                    log.warn(warnMessage);
+                }
+                System.out.println(warnMessage);
                 result = new SampleMetadata(
                         SampleSaveConfiguration.staticConfig());