SONAR-5410 - Fixed process hang when child fails to start

3 files changed, 5 insertions, 4 deletions

diff --git a/server/sonar-process/src/main/java/org/sonar/process/Monitor.java b/server/sonar-process/src/main/java/org/sonar/process/Monitor.java
index d321bce9dcb..a01a49e1745 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/Monitor.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/Monitor.java
@@ -102,7 +102,9 @@ public class Monitor extends Thread {
       try {
         Thread.sleep(1000);
       } catch (InterruptedException e) {
-        e.printStackTrace();
+        LOGGER.warn("Monitoring thread has been interrupted. Closing");
+        watch.cancel(true);
+        monitor.shutdownNow();
       }
     }
     watch.cancel(true);
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 a18809168c6..045a5dcd0b9 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
@@ -129,6 +129,7 @@ public abstract class Process implements ProcessMXBean {
       throw new IllegalStateException("Process is not a compliant MBean", e);
     }
 
+
     shutdownHook = new Thread(new Runnable() {
       @Override
       public void run() {
@@ -183,7 +184,7 @@ public abstract class Process implements ProcessMXBean {
       try {
         shutdownHook.join();
       } catch (InterruptedException e) {
-        e.printStackTrace();
+        System.exit(-1);
       }
     }
     LOGGER.trace("Process[{}]::terminate() END", name);
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 6a892569d74..2ec28711b70 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
@@ -254,8 +254,6 @@ public class ProcessWrapper extends Thread {
     if (this.processMXBean != null) {
       this.processMXBean.terminate();
       waitUntilFinish(this);
-    } else {
-      process.destroy();
     }
   }