diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-03-29 12:27:03 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-03-29 12:27:03 +0200 |
commit | 4bd3fe31f17275c2a2802a6c82e1c67bc2d73a82 (patch) | |
tree | feee85a364f8dc6d05d67e4a3b56bad06eaee37c | |
parent | c9adfe2b0d35a9b02cf696e52b2764bd14250c9f (diff) |
Tolerate no remote resolution
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpRequest.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpRequest.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpRequest.java index a70441b0c64..ff80a8a845d 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpRequest.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpRequest.java @@ -122,12 +122,18 @@ public class HttpRequest extends Request implements ServletOrJdiscHttpRequest { return version; } + /** Returns the remove address, or null if unresolved */ @Override public String getRemoteHostAddress() { - if (remoteAddress instanceof InetSocketAddress) - return ((InetSocketAddress) remoteAddress).getAddress().getHostAddress(); - else + if (remoteAddress instanceof InetSocketAddress) { + InetAddress remoteInetAddress = ((InetSocketAddress) remoteAddress).getAddress(); + if (remoteInetAddress == null) + return null; + return remoteInetAddress.getHostAddress(); + } + else { throw new RuntimeException("Unknown SocketAddress class: " + remoteAddress.getClass().getName()); + } } @Override |