aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSébastien Lesaint <sebastien.lesaint@sonarsource.com>2019-09-04 16:30:07 +0200
committerSonarTech <sonartech@sonarsource.com>2019-09-06 20:21:04 +0200
commitdb731c50cc9985457ef8000220e48bd049003c98 (patch)
tree5f95969fc28c53afe3692b5a6a765a5616d3cdb6
parent6e4367ab807afdb78fe968424f034657ca3802bf (diff)
downloadsonarqube-db731c50cc9985457ef8000220e48bd049003c98.tar.gz
sonarqube-db731c50cc9985457ef8000220e48bd049003c98.zip
SchedulerImpl must not attempt to hard stop SQ twice concurrently
otherwise, two hard stopping threads may interrupt each other and SQ could not stop at all
-rw-r--r--server/sonar-main/src/main/java/org/sonar/application/SchedulerImpl.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/server/sonar-main/src/main/java/org/sonar/application/SchedulerImpl.java b/server/sonar-main/src/main/java/org/sonar/application/SchedulerImpl.java
index 9de3c9acbe7..4e1b9377bc5 100644
--- a/server/sonar-main/src/main/java/org/sonar/application/SchedulerImpl.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/SchedulerImpl.java
@@ -243,8 +243,8 @@ public class SchedulerImpl implements Scheduler, ManagedProcessEventListener, Pr
public void hardStop() {
if (nodeLifecycle.tryToMoveTo(HARD_STOPPING)) {
LOG.info("Hard stopping SonarQube");
+ hardStopImpl();
}
- hardStopImpl();
}
private void hardStopImpl() {