Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

When serializing HttpInfo, return null info if service is not started #6906

Merged
merged 1 commit into from Jul 17, 2014
Merged

When serializing HttpInfo, return null info if service is not started #6906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransport.java
View file
Open in desktop
Expand Up @@ -281,7 +281,11 @@ public BoundTransportAddress boundAddress() {

@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
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/org/elasticsearch/transport/TransportService.java
View file
Open in desktop
Expand Up @@ -127,7 +127,11 @@ public boolean addressSupported(Class<? extends TransportAddress> address) {
}

public TransportInfo info() {
return new TransportInfo(boundAddress());
BoundTransportAddress boundTransportAddress = boundAddress();
if (boundTransportAddress == null) {
return null;
}
return new TransportInfo(boundTransportAddress);
}

public TransportStats stats() {
Expand Down