From 6fc5acd760ecb1e8cf408e3f53b2054bd8807fa7 Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Thu, 17 Jul 2014 15:30:51 +0200
Subject: [PATCH] Return null info if service is not started

Closes #6906
---
 .../elasticsearch/http/netty/NettyHttpServerTransport.java  | 6 +++++-
 .../java/org/elasticsearch/transport/TransportService.java  | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransport.java b/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransport.java
index 94c97061cdd..fe444407afb 100644
--- a/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransport.java
+++ b/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
diff --git a/src/main/java/org/elasticsearch/transport/TransportService.java b/src/main/java/org/elasticsearch/transport/TransportService.java
index 3491882c6ad..e66689b59b8 100644
--- a/src/main/java/org/elasticsearch/transport/TransportService.java
+++ b/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() {