diff options
| author | Teryk Bellahsene <teryk.bellahsene@sonarsource.com> | 2017-08-29 18:41:13 +0200 |
|---|---|---|
| committer | Teryk Bellahsene <teryk@users.noreply.github.com> | 2017-08-30 16:24:53 +0200 |
| commit | 0d26a88c087cb3e7b9428c83221c90a53ae9d186 (patch) | |
| tree | 979fbd831d70e158447ae4c69b679ec4031f57e3 /server | |
| parent | 6ac30297362247e51cb5518eedccad38f1dc86e1 (diff) | |
| download | sonarqube-0d26a88c087cb3e7b9428c83221c90a53ae9d186.tar.gz sonarqube-0d26a88c087cb3e7b9428c83221c90a53ae9d186.zip | |
SONAR-9721 Do not fail when server stops after opt-out
Diffstat (limited to 'server')
| -rw-r--r-- | server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryDaemon.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryDaemon.java b/server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryDaemon.java index 858dd452952..60e9c043701 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryDaemon.java +++ b/server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryDaemon.java @@ -92,6 +92,9 @@ public class TelemetryDaemon implements Startable { @Override public void stop() { try { + if (executorService == null) { + return; + } executorService.shutdown(); executorService.awaitTermination(5, TimeUnit.SECONDS); } catch (InterruptedException e) { |