Keep references on NetClient in socks proxies to avoid them being collected during tests

Author: vietj

vertx-core/src/test/java/io/vertx/test/proxy/Socks4Proxy.java

@@ -43,6 +43,7 @@ public class Socks4Proxy extends TestProxyBase<Socks4Proxy> {
   public static final int DEFAULT_PORT = 11080;
 
   private NetServer server;
+  private NetClient client;
 
   @Override
   public int defaultPort() {
@@ -59,6 +60,7 @@ public int defaultPort() {
   public Socks4Proxy start(Vertx vertx) throws Exception {
     NetServerOptions options = new NetServerOptions();
     options.setHost("localhost").setPort(port);
+    client = vertx.createNetClient(new NetClientOptions());
     server = vertx.createNetServer(options);
     server.connectHandler(socket -> {
       socket.handler(buffer -> {
@@ -94,8 +96,7 @@ public Socks4Proxy start(Vertx vertx) throws Exception {
             port = Integer.valueOf(forceUri.substring(forceUri.indexOf(':') + 1));
           }
           log.debug("connecting to " + host + ":" + port);
-          NetClient netClient = vertx.createNetClient(new NetClientOptions());
-          netClient.connect(port, host).onComplete(result -> {
+          client.connect(port, host).onComplete(result -> {
             if (result.succeeded()) {
               localAddresses.add(result.result().localAddress().toString());
               log.debug("writing: " + toHex(connectResponse));
@@ -159,8 +160,12 @@ private String toHex(Buffer buffer) {
   @Override
   public void stop() {
     if (server != null) {
-      server.close();
+      server.close().await();
       server = null;
     }
+    if (client != null) {
+      client.close().await();
+      client = null;
+    }
   }
 }

vertx-core/src/test/java/io/vertx/test/proxy/SocksProxy.java

@@ -51,6 +51,7 @@ public class SocksProxy extends TestProxyBase<SocksProxy> {
   public static final int DEFAULT_PORT = 11080;
 
   private NetServer server;
+  private NetClient client;
 
   @Override
   public int defaultPort() {
@@ -68,6 +69,7 @@ public SocksProxy start(Vertx vertx) throws Exception {
     NetServerOptions options = new NetServerOptions();
     options.setHost("localhost").setPort(port);
     server = vertx.createNetServer(options);
+    client = vertx.createNetClient(new NetClientOptions());
     server.connectHandler(socket -> {
       socket.handler(buffer -> {
         String username = nextUserName();
@@ -115,8 +117,7 @@ public SocksProxy start(Vertx vertx) throws Exception {
             port = Integer.valueOf(forceUri.substring(forceUri.indexOf(':') + 1));
           }
           log.debug("connecting to " + host + ":" + port);
-          NetClient netClient = vertx.createNetClient(new NetClientOptions());
-          netClient.connect(port, host).onComplete(result -> {
+          client.connect(port, host).onComplete(result -> {
             if (result.succeeded()) {
               localAddresses.add(result.result().localAddress().toString());
               log.debug("writing: " + toHex(connectResponse));
@@ -206,5 +207,9 @@ public void stop() {
       server.close();
       server = null;
     }
+    if (client != null) {
+      client.close().await();
+      client = null;
+    }
   }
 }