Initial load
diff --git a/test/java/net/Socket/TestAfterClose.java b/test/java/net/Socket/TestAfterClose.java
new file mode 100644
index 0000000..61c19cf
--- /dev/null
+++ b/test/java/net/Socket/TestAfterClose.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6505016
+ * @summary Socket spec should clarify what getInetAddress/getPort/etc return after the Socket is closed
+ */
+
+import java.net.*;
+import java.io.*;
+
+public class TestAfterClose
+{
+    static int failCount;
+
+    public static void main(String[] args) {
+        try {
+            ServerSocket ss = new ServerSocket(0, 0, null);
+            Socket socket = new Socket("localhost", ss.getLocalPort());
+            ss.accept();
+            ss.close();
+            test(socket);
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+
+        if (failCount > 0)
+            throw new RuntimeException("Failed: failcount = " + failCount);
+
+    }
+
+    static void test(Socket socket) throws IOException {
+        //Before Close
+        int socketPort = socket.getPort();
+        InetAddress socketInetAddress = socket.getInetAddress();
+        SocketAddress socketRemoteSocketAddress = socket.getRemoteSocketAddress();
+        int socketLocalPort = socket.getLocalPort();
+
+        //After Close
+        socket.close();
+
+        if (socketPort != socket.getPort()) {
+            System.out.println("Socket.getPort failed");
+            failCount++;
+        }
+
+        if (!socket.getInetAddress().equals(socketInetAddress)) {
+            System.out.println("Socket.getInetAddress failed");
+            failCount++;
+        }
+
+        if (!socket.getRemoteSocketAddress().equals(socketRemoteSocketAddress)) {
+            System.out.println("Socket.getRemoteSocketAddresss failed");
+            failCount++;
+        }
+
+        if (socketLocalPort != socket.getLocalPort()) {
+            System.out.println("Socket.getLocalPort failed");
+            failCount++;
+        }
+
+        InetAddress anyAddr = null;
+        try {
+            anyAddr = InetAddress.getByAddress("",new byte[] {0,0,0,0});
+        } catch (UnknownHostException uhe) {
+        }
+
+        if (anyAddr != null && !socket.getLocalAddress().equals(anyAddr)) {
+            System.out.println("Socket.getLocalAddress failed");
+            failCount++;
+        }
+
+        InetSocketAddress addr = new InetSocketAddress(socket.getLocalPort());
+        if (!socket.getLocalSocketAddress().equals(addr)) {
+            System.out.println("Socket.getLocalSocketAddress failed");
+            failCount++;
+        }
+
+        if (!socket.isConnected()) {
+            System.out.println("Socket.isConnected failed");
+            failCount++;
+        }
+
+        if (!socket.isBound()) {
+            System.out.println("Socket.isBound failed");
+            failCount++;
+        }
+    }
+}