JRE-924 Unable to attach with ProcessAttachingConnector to a java 9 processjb8u152-b1293.10

(cherry picked from commit d42536e5bd28895da83e1b7917d021fdaaffca44) (JR-CR-298)

1 files changed, 12 insertions, 26 deletions

diff --git a/src/share/classes/com/sun/tools/jdi/SocketTransportService.java b/src/share/classes/com/sun/tools/jdi/SocketTransportService.java
index 5585a00311..6236c6bc43 100644
--- a/src/share/classes/com/sun/tools/jdi/SocketTransportService.java
+++ b/src/share/classes/com/sun/tools/jdi/SocketTransportService.java
@@ -194,29 +194,15 @@ public class SocketTransportService extends TransportService {
             throw new IllegalArgumentException("timeout is negative");
         }
 
+        InetSocketAddress sa;
         int splitIndex = address.indexOf(':');
-        String host;
-        String portStr;
         if (splitIndex < 0) {
-            host = InetAddress.getLocalHost().getHostName();
-            portStr = address;
+            sa = new InetSocketAddress(InetAddress.getLoopbackAddress(), parsePort(address));
         } else {
-            host = address.substring(0, splitIndex);
-            portStr = address.substring(splitIndex+1);
-        }
-
-        int port;
-        try {
-            port = Integer.decode(portStr).intValue();
-        } catch (NumberFormatException e) {
-            throw new IllegalArgumentException(
-                "unable to parse port number in address");
+            sa = new InetSocketAddress(address.substring(0, splitIndex), parsePort(address.substring(splitIndex+1)));
         }
 
-
         // open TCP connection to VM
-
-        InetSocketAddress sa = new InetSocketAddress(host, port);
         Socket s = new Socket();
         try {
             s.connect(sa, (int)attachTimeout);
@@ -240,6 +226,14 @@ public class SocketTransportService extends TransportService {
         return new SocketConnection(s);
     }
 
+    private static int parsePort(String portStr) {
+        try {
+            return Integer.decode(portStr);
+        } catch (NumberFormatException e) {
+            throw new IllegalArgumentException("unable to parse port number in address");
+        }
+    }
+
     /*
      * Listen on the specified address and port. Return a listener
      * that encapsulates the ServerSocket.
@@ -272,15 +266,7 @@ public class SocketTransportService extends TransportService {
             address = address.substring(splitIndex+1);
         }
 
-        int port;
-        try {
-            port = Integer.decode(address).intValue();
-        } catch (NumberFormatException e) {
-            throw new IllegalArgumentException(
-                    "unable to parse port number in address");
-        }
-
-        return startListening(localaddr, port);
+        return startListening(localaddr, parsePort(address));
     }
 
     /**