--- /dev/null	2018-06-30 13:49:24.634979840 -0700
+++ new/test/jdk/jdk/net/Sockets/rsocket/Socket/InheritTimeout.java	2018-06-30 14:07:41.339166192 -0700
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2001, 2018, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 8195160
+ * @summary Setting ServerSocket.setSoTimeout shouldn't cause
+ *          the timeout to be inherited by accepted connections
+ * @requires (os.family == "linux")
+ * @library .. /test/lib
+ * @build RsocketTest
+ * @run main/othervm -Djava.net.preferIPv4Stack=true InheritTimeout
+ */
+
+import java.net.*;
+import java.io.InputStream;
+import jdk.net.*;
+
+public class InheritTimeout implements Runnable {
+
+    static Socket s1;
+    static ServerSocket ss;
+    static InetAddress addr;
+
+    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) {
+            }
+        }
+    }
+
+    class Client extends Thread {
+        public void run() {
+            InetSocketAddress isa = new InetSocketAddress(addr, ss.getLocalPort());
+            try {
+                s1.connect(isa);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    InheritTimeout() throws Exception {
+        ss = Sockets.openRdmaServerSocket();
+        ss.bind(new InetSocketAddress(addr, 0));
+
+        ss.setSoTimeout(1000);
+
+        s1 = Sockets.openRdmaSocket();
+
+        Client c = new Client();
+        c.start();
+   
+        Socket s2 = ss.accept();
+
+        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 {
+        if (!RsocketTest.isRsocketAvailable())
+            return;
+
+        new InheritTimeout();
+   }
+
+    public void run() {
+        InetSocketAddress isa = new InetSocketAddress(addr, ss.getLocalPort());
+        try {
+            s1.connect(isa);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException("Test Failed!");
+        }
+    }
+}