--- a/src/java.base/share/classes/java/net/Socket.java	Fri Apr 26 11:31:38 2019 +0100
+++ b/src/java.base/share/classes/java/net/Socket.java	Mon Apr 29 09:03:06 2019 +0100
@@ -1578,15 +1578,11 @@
     public void close() throws IOException {
         closeLock.lock();
         try {
-            if (!closed) {
-                try {
-                    SocketImpl impl = this.impl;
-                    if (impl != null)
-                        impl.close();
-                } finally {
-                    closed = true;
-                }
-            }
+            if (closed)
+                return;
+            closed = true;
+            if (created)
+                impl.close();
         } finally {
             closeLock.unlock();
         }