Initial load
diff --git a/test/java/net/PlainSocketImpl/SetOption.java b/test/java/net/PlainSocketImpl/SetOption.java
new file mode 100644
index 0000000..9791481
--- /dev/null
+++ b/test/java/net/PlainSocketImpl/SetOption.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2000 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 4165948
+ * @summary java.net.PlainSocketImpl {set,get}Option throws SocketException
+ *          when socket is closed.
+ */
+
+import java.io.*;
+import java.net.*;
+
+public class SetOption {
+
+    public static void main(String args[]) throws Exception {
+
+        ServerSocket ss = new ServerSocket(0);
+        Socket s1 = new Socket("localhost", ss.getLocalPort());
+        Socket s2 = ss.accept();
+
+        s1.close();
+        boolean exc_thrown = false;
+        try {
+            s1.setSoTimeout(1000);
+        } catch (SocketException e) {
+            exc_thrown = true;
+        }
+
+        if (!exc_thrown) {
+            throw new Exception("SocketException not thrown on closed socket");
+        }
+    }
+}