From 013347be9bf604ae2fc2a8adcc7310f2a587b580 Mon Sep 17 00:00:00 2001
From: Jason Tedor <jason@tedor.me>
Date: Mon, 9 Nov 2015 10:37:16 -0500
Subject: [PATCH] Revert "Merge pull request #14623 from nik9000/no_home_home"

This reverts commit cf8ffd32ac4c31a683a19752708c1f85bda96f3e, reversing
changes made to 40650ad2d5f879bb8fa0826b5bf0927630f5dc23.
---
 .../elasticsearch/gradle/test/ClusterFormationTasks.groovy    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy
index e1d408ead9e..0b835872ec1 100644
--- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy
+++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy
@@ -279,7 +279,7 @@ class ClusterFormationTasks {
             onlyIf { pidFile.exists() }
             // the pid file won't actually be read until execution time, since the read is wrapped within an inner closure of the GString
             ext.pid = "${ -> pidFile.getText('UTF-8').trim()}"
-            commandLine new File(System.getProperty('java.home'), 'bin/jps'), '-l'
+            commandLine new File(System.getenv('JAVA_HOME'), 'bin/jps'), '-l'
             standardOutput = new ByteArrayOutputStream()
             doLast {
                 String out = standardOutput.toString()
@@ -336,4 +336,4 @@ class ClusterFormationTasks {
     static File pidFile(File dir) {
         return new File(dir, 'es.pid')
     }
-}
+}
\ No newline at end of file