--- /dev/null	2018-09-16 08:14:05.604314476 -0700
+++ new/test/jdk/jdk/net/Sockets/rsocket/SocketChannel/AdaptSocket.java	2018-10-05 14:15:06.929757310 -0700
@@ -0,0 +1,181 @@
+/*
+ * Copyright (c) 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 Unit test for socket-channel adaptors
+ * @requires (os.family == "linux")
+ * @library .. /test/lib
+ * @build jdk.test.lib.Utils TestServers
+ * @build RsocketTest
+ * @run main/othervm -Djava.net.preferIPv4Stack=true AdaptSocket
+ */
+
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.SocketTimeoutException;
+import java.nio.channels.SocketChannel;
+import java.util.Arrays;
+import jdk.net.Sockets;
+
+public class AdaptSocket {
+
+    static final PrintStream out = System.out;
+
+    static void test(TestServers.AbstractServer server,
+                     int timeout,
+                     boolean shouldTimeout)
+        throws Exception
+    {
+        out.println();
+
+        InetSocketAddress isa = new InetSocketAddress(server.getAddress(), server.getPort());
+        SocketChannel sc = Sockets.openRdmaSocketChannel();
+        Socket so = sc.socket();
+        out.println("opened: " + so);
+        out.println("        " + sc);
+
+        so.setTcpNoDelay(true);
+        so.setKeepAlive(true);
+        so.setReceiveBufferSize(512);
+        so.setSendBufferSize(512);
+
+        if (timeout == 0)
+            so.connect(isa);
+        else {
+            try {
+                so.connect(isa, timeout);
+            } catch (SocketTimeoutException x) {
+                if (shouldTimeout) {
+                    out.println("Connection timed out, as expected");
+                    return;
+                } else {
+                    throw x;
+                }
+            }
+        }
+        out.println("connected: " + so);
+        out.println("           " + sc);
+        byte[] bb = new byte[100];
+        int n = so.getInputStream().read(bb);
+        String s = new String(bb, 0, n - 2, "US-ASCII");
+        out.println(isa + " says: \"" + s + "\"");
+        so.shutdownInput();
+        out.println("ishut: " + sc);
+        so.shutdownOutput();
+        out.println("oshut: " + sc);
+        so.close();
+        out.println("closed: " + so);
+        out.println("        " + sc);
+    }
+
+    static String dataString = "foo\r\n";
+
+    static void testRead(Socket so, boolean shouldTimeout)
+        throws Exception
+    {
+        String data = "foo\r\n";
+        so.getOutputStream().write(dataString.getBytes("US-ASCII"));
+        InputStream is = so.getInputStream();
+        try {
+            byte[] b = new byte[100];
+            int n = is.read(b);
+            if (shouldTimeout) {
+                throw new Exception("Should time out, but not, data: " + Arrays.toString(b));
+            }
+            if (n != 5) {
+                throw new Exception("Incorrect number of bytes read: " + n);
+            }
+            if (!dataString.equals(new String(b, 0, n, "US-ASCII"))) {
+                throw new Exception("Incorrect data read: " + n);
+            }
+        } catch (SocketTimeoutException x) {
+            if (shouldTimeout) {
+                out.println("Read timed out, as expected");
+                return;
+            }
+            throw x;
+        }
+    }
+
+    static void testRead(TestServers.EchoServer echoServer,
+                         int timeout,
+                         boolean shouldTimeout)
+        throws Exception
+    {
+        out.println();
+
+        InetSocketAddress isa
+            = new InetSocketAddress(echoServer.getAddress(),
+                                    echoServer.getPort());
+        SocketChannel sc = Sockets.openRdmaSocketChannel();
+        sc.connect(isa);
+        Socket so = sc.socket();
+        out.println("connected: " + so);
+        out.println("           " + sc);
+
+        if (timeout > 0)
+            so.setSoTimeout(timeout);
+        out.println("timeout: " + so.getSoTimeout());
+
+        testRead(so, shouldTimeout);
+        for (int i = 0; i < 4; i++) {
+            out.println("loop: " + i);
+            testRead(so, shouldTimeout);
+        }
+
+        sc.close();
+    }
+
+    public static void main(String[] args) throws Exception {
+        if (!RsocketTest.isRsocketAvailable())
+            return;
+
+        try (TestServers.DayTimeServer dayTimeServer
+                = TestServers.DayTimeServer.startNewServer()) {
+            test(dayTimeServer, 0, false);
+            test(dayTimeServer, 1000, false);
+        }
+
+        try (TestServers.DayTimeServer lingerDayTimeServer
+                = TestServers.DayTimeServer.startNewServer(100)) {
+            // this test no longer really test the connection timeout
+            // since there is no way to prevent the server from eagerly
+            // accepting connection...
+            test(lingerDayTimeServer, 10, true);
+        }
+
+        try (TestServers.EchoServer echoServer
+                = TestServers.EchoServer.startNewServer()) {
+            testRead(echoServer, 0, false);
+            testRead(echoServer, 8000, false);
+        }
+
+        try (TestServers.NoResponseServer noResponseServer
+                = TestServers.NoResponseServer.startNewServer()) {
+            testRead(noResponseServer, 10, true);
+        }
+    }
+}