--- /dev/null	2018-06-20 11:01:03.657616567 -0700
+++ new/test/jdk/jdk/net/Sockets/rsocket/Socket/GetLocalAddress.java	2018-06-22 12:24:13.086671492 -0700
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2012, 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 REGRESSION: Socket.getLocalAddress() returns address of 0.0.0.0 on outbound TCP
+ * @requires (os.family == "linux")
+ * @library .. /test/lib
+ * @build RsocketTest
+ * @run main/othervm -Djava.net.preferIPv4Stack=true GetLocalAddress
+ */
+import java.util.*;
+import java.net.*;
+import jdk.net.Sockets;
+
+public class GetLocalAddress implements Runnable {
+
+    static Socket s;
+    static ServerSocket ss;
+    static InetAddress addr;
+    static InetAddress iaLocal;
+    static String sLocalHostname;
+
+    public static void main(String[] args) throws Exception
+    {
+        if (!RsocketTest.isRsocketAvailable())
+            return;
+
+        ss = Sockets.openRdmaServerSocket();
+        addr = InetAddress.getLocalHost();
+        ss.bind(new InetSocketAddress(addr, 0));
+        int port = ss.getLocalPort();
+
+        s = Sockets.openRdmaSocket();
+
+        try {
+            Thread t = new Thread(new GetLocalAddress());
+            t.start();
+        } catch(Exception e) {
+            System.out.println("Exception happened");
+            throw e;
+        } finally {
+            ss.close();
+        }
+    }
+
+    public void run() {
+        try {
+            InetSocketAddress isa = new InetSocketAddress(addr, 0);
+            s.connect( isa, 1000 );
+
+            byte[] bad = {0,0,0,0};
+            InetAddress iaLocal = s.getLocalAddress();
+            String sLocalHostname = iaLocal.getHostName();
+            if (Arrays.equals (iaLocal.getAddress(), bad)) {
+                throw new RuntimeException ("0.0.0.0 returned");
+            }
+            System.out.println("local hostname is "+sLocalHostname );
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException("Test Failed!");
+        }
+    }
+}