Event thread must not interrupt itself when hard stopping

same applies to StopWatcher thread

diff --git a/server/sonar-main/src/main/java/org/sonar/application/process/ManagedProcessHandler.java b/server/sonar-main/src/main/java/org/sonar/application/process/ManagedProcessHandler.java
index 861900dcc20df896d32f0d01cf3e45bd04167c28..d9b6835418d235299d2d946d08dbf48340993fc8 100644 (file)
--- a/server/sonar-main/src/main/java/org/sonar/application/process/ManagedProcessHandler.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/process/ManagedProcessHandler.java
@@ -177,8 +177,13 @@ public class ManagedProcessHandler {
   }
 
   public void stopForcibly() {
-    eventWatcher.interrupt();
-    stopWatcher.interrupt();
+    Thread currentThread = Thread.currentThread();
+    if (currentThread != eventWatcher) {
+      eventWatcher.interrupt();
+    }
+    if (currentThread != stopWatcher) {
+      stopWatcher.interrupt();
+    }
     if (process != null) {
       process.destroyForcibly();
       waitForDown();

diff --git a/server/sonar-main/src/test/java/org/sonar/application/SchedulerImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/SchedulerImplTest.java
index 1277d40ea5f859e280800ffc3000a401efec142a..533e9abc9325aab7bcb920b0d055399d4fa675a8 100644 (file)
--- a/server/sonar-main/src/test/java/org/sonar/application/SchedulerImplTest.java
+++ b/server/sonar-main/src/test/java/org/sonar/application/SchedulerImplTest.java
@@ -63,7 +63,7 @@ import static org.sonar.process.ProcessProperties.Property.CLUSTER_NODE_TYPE;
 public class SchedulerImplTest {
 
   @Rule
-  public TestRule safeguardTimeout = new DisableOnDebug(Timeout.seconds(300));
+  public TestRule safeguardTimeout = new DisableOnDebug(Timeout.seconds(60));
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
   @Rule