Fix SslHandler handshake timeout cancellation bug

mojia · Mar 25, 2013 · 4e60c39 · 4e60c39
1 parent f136fb3
commit 4e60c39
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/handler/src/main/java/io/netty/handler/ssl/SslHandler.java b/handler/src/main/java/io/netty/handler/ssl/SslHandler.java
@@ -314,13 +314,19 @@ public void run() {
             timeoutFuture = null;
         }
 
+        promise.addListener(new ChannelFutureListener() {
+            @Override
+            public void operationComplete(ChannelFuture f) throws Exception {
+                if (timeoutFuture != null) {
+                    timeoutFuture.cancel(false);
+                }
+            }
+        });
+
         ctx.executor().execute(new Runnable() {
             @Override
             public void run() {
                 try {
-                    if (timeoutFuture != null) {
-                        timeoutFuture.cancel(false);
-                    }
                     engine.beginHandshake();
                     handshakePromises.add(promise);
                     flush0(ctx, ctx.newPromise(), true);