INTERNAL: Remove "/<unresolved>" from InetSocketAddress.toString() fo…

…r upward compatibility on JDK 14+
naver · Nov 30, 2023 · a462101 · a462101
1 parent c11e912
commit a462101
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/src/main/java/net/spy/memcached/AddrUtil.java b/src/main/java/net/spy/memcached/AddrUtil.java
@@ -1,6 +1,7 @@
 package net.spy.memcached;
 
 import java.net.InetSocketAddress;
+import java.net.SocketAddress;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -56,4 +57,16 @@ public static List<InetSocketAddress> getAddresses(String s) {
   public static InetSocketAddress getAddress(String s) {
     return getAddresses(s).get(0);
   }
+
+  public static String getSocketAddressString(SocketAddress addr) {
+    if (addr instanceof InetSocketAddress) {
+      InetSocketAddress temp = (InetSocketAddress) addr;
+
+      if (temp.isUnresolved()) {
+        return temp.getHostName() + ":" + temp.getPort();
+      }
+    }
+
+    return addr.toString();
+  }
 }
diff --git a/src/main/java/net/spy/memcached/protocol/TCPMemcachedNodeImpl.java b/src/main/java/net/spy/memcached/protocol/TCPMemcachedNodeImpl.java
@@ -35,6 +35,7 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
+import net.spy.memcached.AddrUtil;
 import net.spy.memcached.ArcusReplNodeAddress;
 import net.spy.memcached.MemcachedNode;
 import net.spy.memcached.MemcachedReplicaGroup;
@@ -407,7 +408,7 @@ public final int getSelectionOps() {
   }
 
   public final String getNodeName() {
-    return name + " " + socketAddress;
+    return name + " " + AddrUtil.getSocketAddressString(socketAddress);
   }
 
   public final ByteBuffer getRbuf() {

diff --git a/src/main/java/net/spy/memcached/util/DefaultKetamaNodeLocatorConfiguration.java b/src/main/java/net/spy/memcached/util/DefaultKetamaNodeLocatorConfiguration.java
@@ -3,6 +3,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import net.spy.memcached.AddrUtil;
 import net.spy.memcached.MemcachedNode;
 
 /**
@@ -36,7 +37,7 @@ protected String getSocketAddressForNode(MemcachedNode node) {
     // all other cases should be as fast as possible.
     String result = socketAddresses.get(node);
     if (result == null) {
-      result = String.valueOf(node.getSocketAddress());
+      result = AddrUtil.getSocketAddressString(node.getSocketAddress());
       result = result.substring(result.indexOf('/') + 1);
       socketAddresses.put(node, result);
     }

diff --git a/src/test/java/net/spy/memcached/MockMemcachedNode.java b/src/test/java/net/spy/memcached/MockMemcachedNode.java
@@ -122,7 +122,7 @@ public int getSelectionOps() {
 
   @Override
   public String getNodeName() {
-    return socketAddress.toString();
+    return AddrUtil.getSocketAddressString(socketAddress);
   }
 
   public ByteBuffer getRbuf() {