aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorDaniel Schwarz <daniel.schwarz@sonarsource.com>2017-08-10 12:01:54 +0200
committerDaniel Schwarz <bartfastiel@users.noreply.github.com>2017-08-10 14:28:12 +0200
commit6bf6ac5279bb26b044e85c2190e13f3014383b4f (patch)
tree970224e0f21db0eebd8087c62ab0c5c3ca493ce8 /server
parent2a44c9b1e3820a3c8690c178f63b71b738518a2c (diff)
downloadsonarqube-6bf6ac5279bb26b044e85c2190e13f3014383b4f.tar.gz
sonarqube-6bf6ac5279bb26b044e85c2190e13f3014383b4f.zip
SONAR-8798 use SonarQube's current JVM to launch Elasticsearch
Diffstat (limited to 'server')
-rw-r--r--server/sonar-process-monitor/src/main/java/org/sonar/application/process/CommandFactoryImpl.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/CommandFactoryImpl.java b/server/sonar-process-monitor/src/main/java/org/sonar/application/process/CommandFactoryImpl.java
index 1214518fb54..2a2bffde8a9 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/application/process/CommandFactoryImpl.java
+++ b/server/sonar-process-monitor/src/main/java/org/sonar/application/process/CommandFactoryImpl.java
@@ -80,7 +80,7 @@ public class CommandFactoryImpl implements CommandFactory {
.addJvmOption(settings.getProps().nonNullValue(ProcessProperties.SEARCH_JAVA_ADDITIONAL_OPTS))
.setJvmOptionsFile(jvmOptionsFile)
.setEnvVariable("ES_JVM_OPTIONS", jvmOptionsFile.toString())
- ;
+ .setEnvVariable("JAVA_HOME", System.getProperties().getProperty("java.home"));
settingsMap.forEach((key, value) -> res.addEsOption("-E" + key + "=" + value));