address() -> resolveAddress

4 files changed, 11 insertions, 11 deletions

diff --git a/jrt/src/com/yahoo/jrt/Acceptor.java b/jrt/src/com/yahoo/jrt/Acceptor.java
index dd4b5a72a4f..9e9dafcbcb5 100644
--- a/jrt/src/com/yahoo/jrt/Acceptor.java
+++ b/jrt/src/com/yahoo/jrt/Acceptor.java
@@ -58,7 +58,7 @@ public class Acceptor {
             if (spec.port() != 0) {
                 serverChannel.socket().setReuseAddress(true);
             }
-            serverChannel.socket().bind(spec.address(), 500);
+            serverChannel.socket().bind(spec.resolveAddress(), 500);
         } catch (Exception e) {
             if (serverChannel != null) {
                 try { serverChannel.socket().close(); } catch (Exception ignore) {}
diff --git a/jrt/src/com/yahoo/jrt/Connection.java b/jrt/src/com/yahoo/jrt/Connection.java
index c24cd145f67..d4e1a15b957 100644
--- a/jrt/src/com/yahoo/jrt/Connection.java
+++ b/jrt/src/com/yahoo/jrt/Connection.java
@@ -171,7 +171,7 @@ class Connection extends Target {
             return this;
         }
         try {
-            socket = parent.transport().createCryptoSocket(SocketChannel.open(spec.address()), false);
+            socket = parent.transport().createCryptoSocket(SocketChannel.open(spec.resolveAddress()), false);
         } catch (Exception e) {
             setLostReason(e);
         }
diff --git a/jrt/src/com/yahoo/jrt/Spec.java b/jrt/src/com/yahoo/jrt/Spec.java
index f4b70bd4f9e..7e21481f3e7 100644
--- a/jrt/src/com/yahoo/jrt/Spec.java
+++ b/jrt/src/com/yahoo/jrt/Spec.java
@@ -126,7 +126,7 @@ public class Spec implements Comparable<Spec> {
      *
      * @return socket address
      */
-    SocketAddress address() {
+    SocketAddress resolveAddress() {
         return !malformed ? createAddress(host, port) : null;
     }
 
diff --git a/jrt/tests/com/yahoo/jrt/SpecTest.java b/jrt/tests/com/yahoo/jrt/SpecTest.java
index bfbab884d74..fd878f0d884 100644
--- a/jrt/tests/com/yahoo/jrt/SpecTest.java
+++ b/jrt/tests/com/yahoo/jrt/SpecTest.java
@@ -19,7 +19,7 @@ public class SpecTest {
         assertFalse(spec.malformed());
         assertEquals(457, spec.port());
         assertNull(spec.host());
-        assertTrue(addr.equals(spec.address()));
+        assertTrue(addr.equals(spec.resolveAddress()));
     }
 
     @org.junit.Test
@@ -32,7 +32,7 @@ public class SpecTest {
         assertFalse(spec.malformed());
         assertEquals(457, spec.port());
         assertEquals(host, spec.host());
-        assertTrue(addr.equals(spec.address()));
+        assertTrue(addr.equals(spec.resolveAddress()));
     }
 
     @org.junit.Test
@@ -45,7 +45,7 @@ public class SpecTest {
         assertFalse(spec.malformed());
         assertEquals(457, spec.port());
         assertEquals(host, spec.host());
-        assertTrue(addr.equals(spec.address()));
+        assertTrue(addr.equals(spec.resolveAddress()));
     }
 
     @org.junit.Test
@@ -57,7 +57,7 @@ public class SpecTest {
         assertFalse(spec.malformed());
         assertEquals(8080, spec.port());
         assertEquals("localhost", spec.host());
-        assertTrue(addr.equals(spec.address()));
+        assertTrue(addr.equals(spec.resolveAddress()));
     }
 
     @org.junit.Test
@@ -69,7 +69,7 @@ public class SpecTest {
         assertFalse(spec.malformed());
         assertEquals(8080, spec.port());
         assertNull(spec.host());
-        assertTrue(addr.equals(spec.address()));
+        assertTrue(addr.equals(spec.resolveAddress()));
     }
 
     @org.junit.Test
@@ -80,7 +80,7 @@ public class SpecTest {
         assertTrue(spec.malformed());
         assertEquals(0, spec.port());
         assertNull(spec.host());
-        assertNull(spec.address());
+        assertNull(spec.resolveAddress());
     }
 
     @org.junit.Test
@@ -91,7 +91,7 @@ public class SpecTest {
         assertTrue(spec.malformed());
         assertEquals(0, spec.port());
         assertNull(spec.host());
-        assertNull(spec.address());
+        assertNull(spec.resolveAddress());
     }
 
     @org.junit.Test
@@ -102,7 +102,7 @@ public class SpecTest {
         assertTrue(spec.malformed());
         assertEquals(0, spec.port());
         assertNull(spec.host());
-        assertNull(spec.address());
+        assertNull(spec.resolveAddress());
     }
 
 }