From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Thu, 28 Aug 2014 07:23:21 +0000 (+0200)
Subject: SONAR-4898 fix NPE on termination of ES
X-Git-Tag: 4.5-RC1~63
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1f0d02d7b2023e358a5947b04523fae35b8b5f63;p=sonarqube.git

SONAR-4898 fix NPE on termination of ES
---

diff --git a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java
index dafb21428d9..5f38b364103 100644
--- a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java
+++ b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java
@@ -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) {