[jmeter] branch master updated: Fix JMeterTestUtils#setupJMeterHome

[vl...@apache.org]

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

vladimirsitnikov 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 680367f  Fix JMeterTestUtils#setupJMeterHome
680367f is described below

commit 680367f2eb3eb2ed012e630ec33ca77fee505a6c
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Sat Aug 3 17:04:21 2019 +0300

    Fix JMeterTestUtils#setupJMeterHome
    
    Initialization of filePrefix was skipped if JMeterUtils was initialized first.
    This casuses test failures depending on which tests are executed first.
---
 src/core/src/test/java/org/apache/jmeter/junit/JMeterTestUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/src/test/java/org/apache/jmeter/junit/JMeterTestUtils.java b/src/core/src/test/java/org/apache/jmeter/junit/JMeterTestUtils.java
index 9b00815..84c6fda 100644
--- a/src/core/src/test/java/org/apache/jmeter/junit/JMeterTestUtils.java
+++ b/src/core/src/test/java/org/apache/jmeter/junit/JMeterTestUtils.java
@@ -28,7 +28,7 @@ import org.apache.jmeter.util.JMeterUtils;
 
 public class JMeterTestUtils {
     // Used by findTestFile
-    private static String filePrefix;
+    private static volatile String filePrefix;
     private JMeterTestUtils() {
         super();
     }
@@ -37,7 +37,7 @@ public class JMeterTestUtils {
      * @return file prefix which is path from jmeter home to jmeter.properties
      */
     public static String setupJMeterHome() {
-        if (JMeterUtils.getJMeterProperties() == null) {
+        if (filePrefix == null) {
             String prefix = ".";
             for (int i = 0; i < 5 && !new File(prefix, "bin/jmeter.properties").canRead(); i++) {
                 prefix = "../" + prefix;