]> source.dussan.org Git - sonarqube.git/commitdiff
SONAR-4898 fix NPE on termination of ES
authorSimon Brandhof <simon.brandhof@sonarsource.com>
Thu, 28 Aug 2014 07:23:21 +0000 (09:23 +0200)
committerSimon Brandhof <simon.brandhof@sonarsource.com>
Thu, 28 Aug 2014 07:23:21 +0000 (09:23 +0200)
server/sonar-search/src/main/java/org/sonar/search/SearchServer.java

index dafb21428d9e0fb63d5705d19f1cae9a1051e734..5f38b364103e43d18835b1c2e07b840fb91b16bf 100644 (file)
@@ -167,7 +167,7 @@ public class SearchServer extends MonitoredProcess {
       .get();
 
     if (isBlocking) {
-      while (!node.isClosed()) {
+      while (node != null && !node.isClosed()) {
         try {
           Thread.sleep(100);
         } catch (InterruptedException e) {