Merge pull request #12986 from s1monw/fix_host_resolving

Only resolve host if explicitly allowed.
2015-08-19 15:25:55 +02:00 · 2015-08-19 15:25:55 +02:00 · ca28acc373
parent e5134317be bd56b0a79e
commit ca28acc373
1 changed files with 5 additions and 1 deletions
--- a/core/src/main/java/org/elasticsearch/common/transport/InetSocketTransportAddress.java
+++ b/core/src/main/java/org/elasticsearch/common/transport/InetSocketTransportAddress.java
@ -94,7 +94,11 @@ public final class InetSocketTransportAddress implements TransportAddress {

    @Override
    public String getHost() {
+        if (resolveAddress) {
            return address.getHostName();
+        } else {
+            return getAddress();
+        }
    }

    @Override