From 4630c8d3bed149d39cbe2d15641337d7ee9d86ad Mon Sep 17 00:00:00 2001
From: Mark Vieira <portugee@gmail.com>
Date: Tue, 28 Jan 2020 11:29:31 -0800
Subject: [PATCH] Fix issue where runtime Java was not properly respected for
 test cluster (#51557)

---
 .../elasticsearch/gradle/testclusters/ElasticsearchNode.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java b/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java
index 86d05cd93649d..7670bee959ba1 100644
--- a/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java
+++ b/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java
@@ -651,7 +651,7 @@ private void runElasticsearchBinScript(String tool, CharSequence... args) {
     private Map<String, String> getESEnvironment() {
         Map<String, String> defaultEnv = new HashMap<>();
         // If we are testing the current version of Elasticsearch, use the configured runtime Java, otherwise use the bundled JDK
-        if (getTestDistribution() == TestDistribution.INTEG_TEST || getVersion().toString().equals(VersionProperties.getElasticsearch())) {
+        if (getTestDistribution() == TestDistribution.INTEG_TEST || getVersion().equals(VersionProperties.getElasticsearchVersion())) {
             defaultEnv.put("JAVA_HOME", BuildParams.getRuntimeJavaHome().getAbsolutePath());
         }
         defaultEnv.put("ES_PATH_CONF", configFile.getParent().toString());