SONAR-5408 - ESNode is in a "transition" state. Must take care of client and node.

1 files changed, 6 insertions, 1 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/ESNode.java b/server/sonar-server/src/main/java/org/sonar/server/search/ESNode.java
index b6334873455..02e8490432d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/search/ESNode.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/search/ESNode.java
@@ -60,6 +60,7 @@ public class ESNode implements Startable {
 
   // available only after startup
   private Client client;
+  private Node node;
 
   public ESNode(ServerFileSystem fileSystem, Settings settings) {
     this(fileSystem, settings, DEFAULT_HEALTH_TIMEOUT);
@@ -107,7 +108,7 @@ public class ESNode implements Startable {
       initRestConsole(esSettings);
       initNetwork(esSettings);
 
-      Node node = NodeBuilder.nodeBuilder()
+      node = NodeBuilder.nodeBuilder()
         .settings(esSettings)
         .node();
       node.start();
@@ -258,6 +259,10 @@ public class ESNode implements Startable {
       client.close();
       client = null;
     }
+    if (node != null) {
+      node.close();
+      node = null;
+    }
   }
 
   public Client client() {