diff -r fd16c54261b3 -r 90ce3da70b43 jdk/test/java/net/Socket/InheritTimeout.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/net/Socket/InheritTimeout.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2001-2002 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 4508149
+ * @summary Setting ServerSocket.setSoTimeout shouldn't cause
+ *          the timeout to be inherited by accepted connections
+ */
+
+import java.net.*;
+import java.io.InputStream;
+
+public class InheritTimeout {
+
+    class Reaper extends Thread {
+        Socket s;
+        int timeout;
+
+        Reaper(Socket s, int timeout) {
+            this.s = s;
+            this.timeout = timeout;
+        }
+
+        public void run() {
+            try {
+                Thread.currentThread().sleep(timeout);
+                s.close();
+            } catch (Exception e) {
+            }
+        }
+    }
+
+   InheritTimeout() throws Exception {
+        ServerSocket ss = new ServerSocket(0);
+        ss.setSoTimeout(1000);
+
+        InetAddress ia = InetAddress.getLocalHost();
+        InetSocketAddress isa =
+            new InetSocketAddress(ia, ss.getLocalPort());
+
+        // client establishes the connection
+        Socket s1 = new Socket();
+        s1.connect(isa);
+
+        // receive the connection
+        Socket s2 = ss.accept();
+
+        // schedule reaper to close the socket in 5 seconds
+        Reaper r = new Reaper(s2, 5000);
+        r.start();
+
+        boolean readTimedOut = false;
+        try {
+            s2.getInputStream().read();
+        } catch (SocketTimeoutException te) {
+            readTimedOut = true;
+        } catch (SocketException e) {
+            if (!s2.isClosed()) {
+                throw e;
+            }
+        }
+
+        s1.close();
+        ss.close();
+
+        if (readTimedOut) {
+            throw new Exception("Unexpected SocketTimeoutException throw!");
+        }
+   }
+
+   public static void main(String args[]) throws Exception {
+        new InheritTimeout();
+   }
+}