SONAR-4898 - fix early termination leaves search server as ghost

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 e4c5abcac513817af7208174d703d3a2b2e54101..eb7433f83dc59bdba8d5dcb8335e61e270ff20ae 100644 (file)
--- a/sonar-application/src/main/java/org/sonar/application/App.java
+++ b/sonar-application/src/main/java/org/sonar/application/App.java
@@ -126,11 +126,6 @@ public class App implements ProcessMXBean {
 
   @Override
   public void terminate() {
-    if (monitor != null && monitor.isAlive()) {
-      monitor.terminate();
-      monitor.interrupt();
-      monitor = null;
-    }
     if (server != null) {
       server.terminate();
       server = null;
@@ -139,6 +134,11 @@ public class App implements ProcessMXBean {
       elasticsearch.terminate();
       elasticsearch = null;
     }
+    if (monitor != null && monitor.isAlive()) {
+      monitor.terminate();
+      monitor.interrupt();
+      monitor = null;
+    }
   }
 
   private boolean isSuccess() {