From 25a2ade13058f862c99ae80de4655104bcd4fa33 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Wed, 8 Apr 2009 22:12:29 +0000 Subject: [PATCH] An experimental workaround for infinite blocking SSLEngine --- src/main/java/org/jboss/netty/handler/ssl/SslHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java b/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java index 81fdb0bcd2..108bb1983b 100644 --- a/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java +++ b/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java @@ -645,13 +645,14 @@ public class SslHandler extends FrameDecoder { for (;;) { SSLEngineResult result; synchronized (handshakeLock) { + boolean outboundDone = engine.isOutboundDone(); if (initialHandshake && !engine.getUseClientMode() && - !engine.isInboundDone() && !engine.isOutboundDone()) { + !engine.isInboundDone() && !outboundDone) { handshake(channel); initialHandshake = false; } - if (channel.getCloseFuture().isDone()) { + if (outboundDone && !channel.isConnected()) { ChannelFuture handshakeFuture = this.handshakeFuture; if (handshakeFuture != null && handshakeFuture.getCause() != null) {