SONAR-9721 Do not fail when server stops after opt-out

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 858dd452952268571ac46d0de42fe3db8de6d3a2..60e9c0437015624da2aa0faee47506c050e8ffd9 100644 (file)
--- 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) {