Reverted back the experimental workaround for SslHandler that did not work

This commit is contained in:
Trustin Lee 2009-04-10 00:38:36 +00:00
parent a18a070b60
commit f1b6534aaf

View File

@ -645,21 +645,12 @@ public class SslHandler extends FrameDecoder {
for (;;) { for (;;) {
SSLEngineResult result; SSLEngineResult result;
synchronized (handshakeLock) { synchronized (handshakeLock) {
boolean outboundDone = engine.isOutboundDone();
if (initialHandshake && !engine.getUseClientMode() && if (initialHandshake && !engine.getUseClientMode() &&
!engine.isInboundDone() && !outboundDone) { !engine.isInboundDone() && !engine.isOutboundDone()) {
handshake(channel); handshake(channel);
initialHandshake = false; initialHandshake = false;
} }
if (outboundDone && !channel.isConnected()) {
ChannelFuture handshakeFuture = this.handshakeFuture;
if (handshakeFuture != null &&
handshakeFuture.getCause() != null) {
break;
}
}
try { try {
result = engine.unwrap(inNetBuf, outAppBuf); result = engine.unwrap(inNetBuf, outAppBuf);
} catch (SSLException e) { } catch (SSLException e) {