SONAR-4898 - Added shutdown & interupt to shutdown hook

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 f869ab08f788ef89013640fef73ba1c8d09d4c68..0fadc4d5190c5091aceda13954762ba80fb8aeb6 100644 (file)
--- a/server/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java
@@ -74,6 +74,7 @@ public class ProcessWrapper extends Thread {
   }
 
   public void shutdown() {
+    this.interrupt();
     this.process.destroy();
   }
 

diff --git a/sonar-start/src/main/java/org/sonar/start/StartServer.java b/sonar-start/src/main/java/org/sonar/start/StartServer.java
index 77c06ed8441e9df993da3f1c6cd1f7bf112f9b97..543a24b3387bf52bed73078b1b46b04310d6a9b5 100644 (file)
--- a/sonar-start/src/main/java/org/sonar/start/StartServer.java
+++ b/sonar-start/src/main/java/org/sonar/start/StartServer.java
@@ -72,7 +72,7 @@ public final class StartServer {
       public void run() {
         LOGGER.info("Shutting down sonar Node");
         //sonarQube.shutdown();
-        elasticsearch.interrupt();
+        elasticsearch.shutdown();
         executor.shutdown();
         try {
           executor.awaitTermination(10L, TimeUnit.SECONDS);