diff options
| author | Stephane Gamard <stephane.gamard@searchbox.com> | 2014-07-21 10:31:55 +0200 |
|---|---|---|
| committer | Stephane Gamard <stephane.gamard@searchbox.com> | 2014-07-21 10:31:55 +0200 |
| commit | d1bba451c98e4edbdb4ace0a4b9292a85fe4a3eb (patch) | |
| tree | f48dd436a98eced28b2ab01e8b38f61c748fe5fb /server/sonar-process | |
| parent | 5eb6228bfcbfc3868a248e387f7331cfdc50421f (diff) | |
| download | sonarqube-d1bba451c98e4edbdb4ace0a4b9292a85fe4a3eb.tar.gz sonarqube-d1bba451c98e4edbdb4ace0a4b9292a85fe4a3eb.zip | |
SONAR-5410 - Fix multiple properties in JAVA_OPTS
Diffstat (limited to 'server/sonar-process')
| -rw-r--r-- | server/sonar-process/src/main/java/org/sonar/process/Process.java | 2 | ||||
| -rw-r--r-- | server/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/server/sonar-process/src/main/java/org/sonar/process/Process.java b/server/sonar-process/src/main/java/org/sonar/process/Process.java index f97aef7b77a..a18809168c6 100644 --- a/server/sonar-process/src/main/java/org/sonar/process/Process.java +++ b/server/sonar-process/src/main/java/org/sonar/process/Process.java @@ -63,7 +63,6 @@ public abstract class Process implements ProcessMXBean { protected final Props props; private Thread shutdownHook; - private volatile boolean JVM_SHUTDOWN = false; private static final long MAX_ALLOWED_TIME = 3000L; private ScheduledFuture<?> pingTask = null; @@ -134,7 +133,6 @@ public abstract class Process implements ProcessMXBean { @Override public void run() { LOGGER.trace("Process[{}]::ShutdownHook::run() START", name); - Process.this.JVM_SHUTDOWN = true; Process.this.onTerminate(); if (Process.this.pingTask != null) { Process.this.pingTask.cancel(true); diff --git a/server/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java b/server/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java index ea9b86a6621..6a892569d74 100644 --- a/server/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java +++ b/server/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java @@ -192,7 +192,10 @@ public class ProcessWrapper extends Thread { processBuilder.command().add(getJavaCommand()); if (!StringUtils.isEmpty(javaOpts)) { - processBuilder.command().add(javaOpts); + LOGGER.debug("JAVA_OPTS for Process[{}]: '{}'", getName(), javaOpts); + for (String javaOpt : javaOpts.split(" ")) { + processBuilder.command().add(javaOpt); + } } processBuilder.command().addAll(getJMXOptions()); processBuilder.command().addAll(getClassPath()); |