Fix incorrect client WebSocket upgrade handshake timeout cancellation.

Motivation:

When the HTTP client connection ugprades to a WebSocket it sets a timeout for the WebSocket handshake, when the upgrade is succesfull it cancels the timeout timer.

The current cancellation check does not account for the initial timer ID that is 0.

Changes:

Cancel correctly the timeout timer.

Author: vietj

vertx-core/src/main/java/io/vertx/core/http/impl/Http1xClientConnection.java

@@ -969,7 +969,7 @@ synchronized void toWebSocket(
       }
 
       long timer;
-      if (handshakeTimeout > 0L) {
+      if (handshakeTimeout > -1L) {
         timer = vertx.setTimer(handshakeTimeout, id -> closeInternal());
       } else {
         timer = -1;
@@ -1000,7 +1000,7 @@ synchronized void toWebSocket(
       WebSocketHandshakeInboundHandler handshakeInboundHandler = new WebSocketHandshakeInboundHandler(handshaker, upgrade);
       p.addBefore("handler", "handshakeCompleter", handshakeInboundHandler);
       upgrade.addListener((GenericFutureListener<io.netty.util.concurrent.Future<HttpHeaders>>) future -> {
-        if (timer > 0L) {
+        if (timer > -1L) {
           vertx.cancelTimer(timer);
         }
         if (future.isSuccess()) {

vertx-core/src/test/java/io/vertx/tests/http/WebSocketTest.java

@@ -1722,7 +1722,7 @@ public List<Throwable> getReceivedExceptions() {
   }
 
   @Test
-  public void testHandshakeTimeout() throws Exception {
+  public void testHandshakeTimeoutFires() throws Exception {
     NetServer server = vertx.createNetServer()
       .connectHandler(so -> {
 
@@ -1746,6 +1746,32 @@ public void testHandshakeTimeout() throws Exception {
     }
   }
 
+  @Test
+  public void testHandshakeTimeoutDoesNotFire() throws Exception {
+    server = vertx.createHttpServer()
+      .webSocketHandler(ws -> {
+
+    });
+    server
+      .listen(DEFAULT_HTTP_PORT, DEFAULT_HTTP_HOST)
+      .await();
+    client = vertx.createWebSocketClient(new WebSocketClientOptions().setConnectTimeout(1000));
+    WebSocketConnectOptions options = new WebSocketConnectOptions()
+      .setPort(DEFAULT_HTTP_PORT)
+      .setHost(DEFAULT_HTTP_HOST)
+      .setURI("/")
+      .setTimeout(1000);
+    client.connect(options).onComplete(onSuccess(ws -> {
+      AtomicBoolean closed = new AtomicBoolean();
+      ws.closeHandler(v -> closed.set(true));
+      vertx.setTimer(1100, id -> {
+        assertFalse(closed.get());
+        testComplete();
+      });
+    }));
+    await();
+  }
+
   private void connectUntilWebSocketReject(WebSocketClient client, int count, Handler<AsyncResult<Void>> doneHandler) {
     vertx.runOnContext(v -> {
       client.connect(DEFAULT_HTTP_PORT, HttpTestBase.DEFAULT_HTTP_HOST, "/some/path").onComplete(ar -> {