diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-10-03 15:08:31 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-10-03 15:25:48 +0200 |
| commit | 0d797dd4a916a5d093e65fa25d5c14d618f9e92a (patch) | |
| tree | af3cf2395927df2addbab58a9668a196d6f1a83f /server/sonar-search | |
| parent | 42ad3f41b26168de03f9fe5e17f019fbd718140e (diff) | |
| download | sonarqube-0d797dd4a916a5d093e65fa25d5c14d618f9e92a.tar.gz sonarqube-0d797dd4a916a5d093e65fa25d5c14d618f9e92a.zip | |
Fix loading of settings tabs
Diffstat (limited to 'server/sonar-search')
| -rw-r--r-- | server/sonar-search/src/main/java/org/sonar/search/SearchServer.java | 4 |
1 files changed, 2 insertions, 2 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 860d5c33423..add2f6df442 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 @@ -160,7 +160,7 @@ public class SearchServer implements Monitored { @Override public boolean isReady() { - return node.client().admin().cluster().prepareHealth() + return node != null && node.client().admin().cluster().prepareHealth() .setWaitForYellowStatus() .setTimeout(TimeValue.timeValueSeconds(3L)) .get() @@ -207,7 +207,7 @@ public class SearchServer implements Monitored { } @Override - public synchronized void stop() { + public void stop() { if (node != null && !node.isClosed()) { node.close(); } |