From d1fadbe08865e7bb38c7a278148053e793422818 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Wed, 24 Feb 2016 13:50:17 +0100 Subject: [PATCH] SONAR-7384 ensure no thread can await its own termination in Monitor --- .../src/main/java/org/sonar/process/monitor/Monitor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/Monitor.java b/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/Monitor.java index 8f9aa7e59cf..1aef72c479c 100644 --- a/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/Monitor.java +++ b/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/Monitor.java @@ -451,7 +451,7 @@ public class Monitor { } private static void awaitTermination(@Nullable Thread t) { - if (t == null) { + if (t == null || Thread.currentThread() == t) { return; } -- 2.39.5