Browse Source

Return null info if service is not started

Closes #6906
Simon Willnauer 11 years ago
parent
commit
6fc5acd760

+ 5 - 1
src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransport.java

@@ -281,7 +281,11 @@ public class NettyHttpServerTransport extends AbstractLifecycleComponent<HttpSer
 
     @Override
     public HttpInfo info() {
-        return new HttpInfo(boundAddress(), maxContentLength.bytes());
+        BoundTransportAddress boundTransportAddress = boundAddress();
+        if (boundTransportAddress == null) {
+            return null;
+        }
+        return new HttpInfo(boundTransportAddress, maxContentLength.bytes());
     }
 
     @Override

+ 5 - 1
src/main/java/org/elasticsearch/transport/TransportService.java

@@ -127,7 +127,11 @@ public class TransportService extends AbstractLifecycleComponent<TransportServic
     }
 
     public TransportInfo info() {
-        return new TransportInfo(boundAddress());
+        BoundTransportAddress boundTransportAddress = boundAddress();
+        if (boundTransportAddress == null) {
+            return null;
+        }
+        return new TransportInfo(boundTransportAddress);
     }
 
     public TransportStats stats() {