--- a/src/java.base/share/classes/java/net/SocketImpl.java	Sat Feb 09 08:54:02 2019 +0000
+++ b/src/java.base/share/classes/java/net/SocketImpl.java	Sat Feb 09 19:16:30 2019 +0000
@@ -72,7 +72,7 @@
      */
     protected int localport;
 
-    private static boolean useNioSocketImpl = getUseNioSocketImpl();
+    private static final boolean useNioSocketImpl = getUseNioSocketImpl();
 
     // A simple way to override the socketimpl by creating a file in $user.dir
     private static boolean getUseNioSocketImpl() {
@@ -90,7 +90,7 @@
         }
     }
 
-    static SocketImpl getDefaultSocketImpl(boolean server) {
+    static SocketImpl createDefaultSocketImpl(boolean server) {
         if (useNioSocketImpl) {
             return new NioSocketImpl(server);
         } else {
@@ -98,7 +98,6 @@
         }
     }
 
-
     /**
      * Creates either a stream or a datagram socket.
      *
@@ -332,20 +331,6 @@
      */
     interface DelegatingImpl {
         SocketImpl delegate();
-        SocketImpl newInstance();
-        void postCustomAccept();
-
-        default void copyTo(SocketImpl dest) {
-            SocketImpl src = delegate();
-            if (dest instanceof DelegatingImpl)
-                dest = ((DelegatingImpl)dest).delegate();
-            if (src instanceof NioSocketImpl) {
-                ((NioSocketImpl)src).copyTo(dest);
-            } else if (src instanceof PlainSocketImpl) {
-                ((PlainSocketImpl)src).copyTo(dest);
-            } else
-                throw new InternalError();
-        }
     }
 
     /**