diff options
| author | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2016-02-24 13:50:17 +0100 |
|---|---|---|
| committer | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2016-02-24 15:52:02 +0100 |
| commit | d1fadbe08865e7bb38c7a278148053e793422818 (patch) | |
| tree | cedcdf804322f13ebb228d1cde965bc0d0500974 /server/sonar-process-monitor | |
| parent | d46588192ab9551fa3d4e3129038bede2bb84cca (diff) | |
| download | sonarqube-d1fadbe08865e7bb38c7a278148053e793422818.tar.gz sonarqube-d1fadbe08865e7bb38c7a278148053e793422818.zip | |
SONAR-7384 ensure no thread can await its own termination in Monitor
Diffstat (limited to 'server/sonar-process-monitor')
| -rw-r--r-- | server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/Monitor.java | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |