8282506: Clean up remaining references to TwoStacksPlain*SocketImpl

Reviewed-by: dfuchs

Author: djelinski

test/jdk/java/net/DatagramSocket/UnreferencedDatagramSockets.java

@@ -232,19 +232,6 @@ private static void extractRefs(DatagramSocket s, String name) {
                 fileDescriptorField.setAccessible(true);
                 FileDescriptor fileDescriptor = (FileDescriptor) fileDescriptorField.get(datagramSocketImpl);
                 extractRefs(fileDescriptor, name);
-
-                Class<?> socketImplClass = datagramSocketImpl.getClass();
-                System.out.printf("socketImplClass: %s%n", socketImplClass);
-                if (socketImplClass.getName().equals("java.net.TwoStacksPlainDatagramSocketImpl")) {
-                    Field fileDescriptor1Field = socketImplClass.getDeclaredField("fd1");
-                    fileDescriptor1Field.setAccessible(true);
-                    FileDescriptor fileDescriptor1 = (FileDescriptor) fileDescriptor1Field.get(datagramSocketImpl);
-                    extractRefs(fileDescriptor1, name + "::twoStacksFd1");
-
-                } else {
-                    System.out.printf("socketImpl class name not matched: %s != %s%n",
-                            socketImplClass.getName(), "java.net.TwoStacksPlainDatagramSocketImpl");
-                }
             }
         } catch (Exception ex) {
             ex.printStackTrace();

test/jdk/java/net/MulticastSocket/UnreferencedMulticastSockets.java

@@ -270,19 +270,6 @@ private static void extractRefs(DatagramSocket s, String name) {
                 fileDescriptorField.setAccessible(true);
                 FileDescriptor fileDescriptor = (FileDescriptor) fileDescriptorField.get(datagramSocketImpl);
                 extractRefs(fileDescriptor, name);
-
-                Class<?> socketImplClass = datagramSocketImpl.getClass();
-                System.out.printf("socketImplClass: %s%n", socketImplClass);
-                if (socketImplClass.getName().equals("java.net.TwoStacksPlainDatagramSocketImpl")) {
-                    Field fileDescriptor1Field = socketImplClass.getDeclaredField("fd1");
-                    fileDescriptor1Field.setAccessible(true);
-                    FileDescriptor fileDescriptor1 = (FileDescriptor) fileDescriptor1Field.get(datagramSocketImpl);
-                    extractRefs(fileDescriptor1, name + "::twoStacksFd1");
-
-                } else {
-                    System.out.printf("socketImpl class name not matched: %s != %s%n",
-                            socketImplClass.getName(), "java.net.TwoStacksPlainDatagramSocketImpl");
-                }
             }
         } catch (Exception ex) {
             ex.printStackTrace();

test/jdk/java/net/ServerSocket/UnreferencedSockets.java

@@ -185,16 +185,6 @@ private static void extractRefs(Socket s, String name) {
             fileDescriptorField.setAccessible(true);
             FileDescriptor fileDescriptor = (FileDescriptor) fileDescriptorField.get(socketImpl);
             extractRefs(fileDescriptor, name);
-
-            Class<?> socketImplClass = socketImpl.getClass();
-            System.out.printf("socketImplClass: %s%n", socketImplClass);
-            if (socketImplClass.getClass().getName().equals("java.net.TwoStacksPlainSocketImpl")) {
-                Field fileDescriptor1Field = socketImplClass.getDeclaredField("fd1");
-                fileDescriptor1Field.setAccessible(true);
-                FileDescriptor fileDescriptor1 = (FileDescriptor) fileDescriptor1Field.get(socketImpl);
-                extractRefs(fileDescriptor1, name + "::twoStacksFd1");
-
-            }
         } catch (NoSuchFieldException | IllegalAccessException ex) {
             ex.printStackTrace();
             throw new AssertionError("missing field", ex);