summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2014-08-28 09:23:21 +0200
committerSimon Brandhof <simon.brandhof@sonarsource.com>2014-08-28 09:23:21 +0200
commit1f0d02d7b2023e358a5947b04523fae35b8b5f63 (patch)
treed60aad85f9d3672bf8fdbe52af76cea2845eb80c
parent1087eb5bd0be95e6741cce5fff7e4cdcb2283d5b (diff)
downloadsonarqube-1f0d02d7b2023e358a5947b04523fae35b8b5f63.tar.gz
sonarqube-1f0d02d7b2023e358a5947b04523fae35b8b5f63.zip
SONAR-4898 fix NPE on termination of ES
-rw-r--r--server/sonar-search/src/main/java/org/sonar/search/SearchServer.java2
1 files changed, 1 insertions, 1 deletions
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) {