honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[build] Use always set java.home 

`System.getenv('JAVA_HOME')` relies on JAVA_HOME being setup by the user.
`System.getProperty('java.home')` is set by Java all the time.

Closes #14614
This commit is contained in:
Nik Everett 2015-11-09 08:12:08 -05:00
parent 40650ad2d5
commit a7b78bf67a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy
View File

@ -279,7 +279,7 @@ class ClusterFormationTasks {
onlyIf { pidFile.exists() } 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 // 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()}" ext.pid = "${ -> pidFile.getText('UTF-8').trim()}"
commandLine new File(System.getenv('JAVA_HOME'), 'bin/jps'), '-l' commandLine new File(System.getProperty('java.home'), 'bin/jps'), '-l'
standardOutput = new ByteArrayOutputStream() standardOutput = new ByteArrayOutputStream()
doLast { doLast {
String out = standardOutput.toString() String out = standardOutput.toString()