--- old/test/jdk/jdk/net/RdmaSockets/rsocket/Selector/Connect.java	2018-12-14 12:22:17.669802961 +0000
+++ new/test/jdk/jdk/net/RdmaSockets/rsocket/Selector/Connect.java	2018-12-14 12:22:17.369802961 +0000
@@ -23,7 +23,7 @@
 
 /* @test
  * @bug 8195160
- * @summary Test Test Making lots of Selectors
+ * @summary Test making lots of Selectors
  * @requires (os.family == "linux")
  * @library .. /test/lib
  * @build jdk.test.lib.Utils TestServers
@@ -33,26 +33,21 @@
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
-import java.net.StandardProtocolFamily;
 import java.nio.ByteBuffer;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
 import java.nio.channels.SocketChannel;
-import java.nio.channels.spi.SelectorProvider;
 import java.util.Iterator;
 import java.util.Set;
 import jdk.net.RdmaSockets;
-
 import jtreg.SkippedException;
+import static java.net.StandardProtocolFamily.INET;
 
-public class Connect implements Runnable {
+public class Connect {
 
     static int success = 0;
-    static int LIMIT = 30;
-    static SocketChannel sc;
-    static InetSocketAddress isa;
-    static boolean connected;
-    
+    static final int LIMIT = 30;
+
     public static void main(String[] args) throws Exception {
         if (!RsocketTest.isRsocketAvailable())
             throw new SkippedException("rsocket is not available");
@@ -67,22 +62,21 @@
         throws Exception
     {
         InetAddress myAddress = daytimeServer.getAddress();
-        isa = new InetSocketAddress(myAddress, daytimeServer.getPort());
+        InetSocketAddress isa = new InetSocketAddress(myAddress, daytimeServer.getPort());
 
         for (int j=0; j<LIMIT; j++) {
-            sc = RdmaSockets.openSocketChannel(StandardProtocolFamily.INET);
+            SocketChannel sc = RdmaSockets.openSocketChannel(INET);
             sc.configureBlocking(false);
+            boolean connected = sc.connect(isa);
+            System.out.println("connected = " + connected);
 
-            Thread t = new Thread (new Connect());
-            t.start();
-            t.join();
             if (!connected) {
-                Selector RSelector = RdmaSockets.openSelector();
-                SelectionKey RKey = sc.register (RSelector, SelectionKey.OP_CONNECT);
+                Selector selector = RdmaSockets.openSelector();
+                sc.register(selector, SelectionKey.OP_CONNECT);
                 while (!connected) {
-                    int keysAdded = RSelector.select(100);
+                    int keysAdded = selector.select(100);
                     if (keysAdded > 0) {
-                        Set<SelectionKey> readyKeys = RSelector.selectedKeys();
+                        Set<SelectionKey> readyKeys = selector.selectedKeys();
                         Iterator<SelectionKey> i = readyKeys.iterator();
                         while (i.hasNext()) {
                             SelectionKey sk = i.next();
@@ -92,7 +86,7 @@
                         readyKeys.clear();
                     }
                 }
-                RSelector.close();
+                selector.close();
             }
             readAndClose(sc);
         }
@@ -107,14 +101,4 @@
         success++;
         System.out.println("success count = " + success);
     }
-
-    public void run() {
-        try {
-            connected = sc.connect(isa);
-            System.out.println("connected = " + connected);
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new RuntimeException("Test Failed!");
-        }
-    }
 }