Agent: avoid NPE if http server is not yet started

Closes elastic#382
spalger · Feb 11, 2015 · 9bd8a7f · 9bd8a7f
1 parent 1050086
commit 9bd8a7f
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/agent/src/main/java/org/elasticsearch/marvel/agent/Utils.java b/agent/src/main/java/org/elasticsearch/marvel/agent/Utils.java
@@ -87,11 +87,16 @@ public static String nodeDescription(DiscoveryNode node) {
 
     public static String[] extractHostsFromHttpServer(HttpServer httpServer, ESLogger logger) {
         logger.debug("deriving host setting from httpServer");
-        BoundTransportAddress boundAddress = httpServer.info().address();
-        if (httpServer.lifecycleState() != Lifecycle.State.STARTED || boundAddress == null || boundAddress.boundAddress() == null) {
+        BoundTransportAddress boundAddress = null;
+        if (httpServer.lifecycleState() == Lifecycle.State.STARTED) {
+            boundAddress = httpServer.info().address();
+        }
+
+        if (boundAddress == null || boundAddress.boundAddress() == null) {
             logger.debug("local http server is not yet started. can't connect");
             return null;
         }
+
         if (boundAddress.boundAddress().uniqueAddressTypeId() != 1) {
             logger.error("local node is not bound via the http transport. can't connect");
             return null;