Improve handling of some thread interruptions

2 files changed, 3 insertions, 1 deletions

diff --git a/server/sonar-process/src/main/java/org/sonar/process/ProcessEntryPoint.java b/server/sonar-process/src/main/java/org/sonar/process/ProcessEntryPoint.java
index 2ca262205ce..af3dd630291 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/ProcessEntryPoint.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/ProcessEntryPoint.java
@@ -135,7 +135,7 @@ public class ProcessEntryPoint implements Stoppable {
       stopperThread.join();
       lifecycle.tryToMoveTo(Lifecycle.State.STOPPED);
     } catch (InterruptedException e) {
-      // nothing to do, the process is going to be exited
+      Thread.currentThread().interrupt();
     }
     exit.exit(0);
   }
diff --git a/server/sonar-process/src/main/java/org/sonar/process/StopWatcher.java b/server/sonar-process/src/main/java/org/sonar/process/StopWatcher.java
index 3248e519558..42cb2e9c3b2 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/StopWatcher.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/StopWatcher.java
@@ -56,6 +56,8 @@ public class StopWatcher extends Thread {
             Thread.sleep(delayMs);
           } catch (InterruptedException ignored) {
             watching = false;
+            // restore interrupted flag
+            Thread.currentThread().interrupt();
           }
         }
       }