aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-application/src/main/java
diff options
context:
space:
mode:
authorSébastien Lesaint <sebastien.lesaint@sonarsource.com>2017-09-11 15:22:03 +0200
committerSébastien Lesaint <sebastien.lesaint@sonarsource.com>2017-09-19 10:24:01 +0200
commitd8c9b99b1aec0aca512bc68ae26b8ce2e09b24cf (patch)
treeccbacf6304a4e2021737aa15b0b395746570352e /sonar-application/src/main/java
parent29206c1d0c22b77881da32ae38aeac504e5b2d4c (diff)
downloadsonarqube-d8c9b99b1aec0aca512bc68ae26b8ce2e09b24cf.tar.gz
sonarqube-d8c9b99b1aec0aca512bc68ae26b8ce2e09b24cf.zip
SONAR-9773 ignore JAVA_TOOL_OPTIONS is defined and log warning
Diffstat (limited to 'sonar-application/src/main/java')
-rw-r--r--sonar-application/src/main/java/org/sonar/application/App.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/sonar-application/src/main/java/org/sonar/application/App.java b/sonar-application/src/main/java/org/sonar/application/App.java
index 4e25774bc5e..54d233f5947 100644
--- a/sonar-application/src/main/java/org/sonar/application/App.java
+++ b/sonar-application/src/main/java/org/sonar/application/App.java
@@ -27,6 +27,7 @@ import org.sonar.application.process.ProcessLauncher;
import org.sonar.application.process.ProcessLauncherImpl;
import org.sonar.application.process.StopRequestWatcher;
import org.sonar.application.process.StopRequestWatcherImpl;
+import org.sonar.process.System2;
import org.sonar.process.SystemExit;
import org.sonar.process.command.CommandFactory;
import org.sonar.process.command.CommandFactoryImpl;
@@ -52,7 +53,7 @@ public class App {
appState.registerClusterName(settings.getProps().value(CLUSTER_NAME, "sonarqube"));
AppReloader appReloader = new AppReloaderImpl(settingsLoader, fileSystem, appState, logging);
fileSystem.reset();
- CommandFactory commandFactory = new CommandFactoryImpl(settings.getProps(), fileSystem.getTempDir());
+ CommandFactory commandFactory = new CommandFactoryImpl(settings.getProps(), fileSystem.getTempDir(), System2.INSTANCE);
try (ProcessLauncher processLauncher = new ProcessLauncherImpl(fileSystem.getTempDir())) {
Scheduler scheduler = new SchedulerImpl(settings, appReloader, commandFactory, processLauncher, appState);