Replaced InetAddress.getCanonicalHostName() with HostName.getLocalHost() for docker IPv6 compatibility

1 files changed, 2 insertions, 3 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/osgi/ContainerRpcAdaptor.java b/container-core/src/main/java/com/yahoo/container/osgi/ContainerRpcAdaptor.java
index 6b06b872770..8b0ed41cd8c 100644
--- a/container-core/src/main/java/com/yahoo/container/osgi/ContainerRpcAdaptor.java
+++ b/container-core/src/main/java/com/yahoo/container/osgi/ContainerRpcAdaptor.java
@@ -12,13 +12,12 @@ import com.yahoo.jrt.Supervisor;
 import com.yahoo.jrt.Transport;
 import com.yahoo.jrt.slobrok.api.Register;
 import com.yahoo.jrt.slobrok.api.SlobrokList;
-import com.yahoo.net.LinuxInetAddress;
+import com.yahoo.net.HostName;
 import com.yahoo.log.LogLevel;
 import com.yahoo.osgi.Osgi;
 import com.yahoo.yolean.Exceptions;
 import org.osgi.framework.Bundle;
 
-import java.net.UnknownHostException;
 import java.util.List;
 import java.util.Optional;
 import java.util.logging.Logger;
@@ -44,7 +43,7 @@ public class ContainerRpcAdaptor extends AbstractRpcAdaptor {
     public ContainerRpcAdaptor(Osgi osgi) {
         this.osgi = osgi;
         this.supervisor = new Supervisor(new Transport());
-        this.hostname = LinuxInetAddress.getLocalHost().getCanonicalHostName();
+        this.hostname = HostName.getLocalhost();
 
         bindCommands(supervisor);
     }