andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Potential fix for intermittent SSL test failures

Browse Source
This commit is contained in:
Trustin Lee 2008-11-16 11:29:36 +00:00
parent c848b8cc58
commit 834277a9eb
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/jboss/netty/handler/ssl/SslHandler.java
View File

@ -621,10 +621,8 @@ public class SslHandler extends FrameDecoder {
runDelegatedTasks(); runDelegatedTasks();
break; break;
case FINISHED: case FINISHED:
setHandshakeSuccess(channel);
wrap(ctx, channel);
break loop;
case NOT_HANDSHAKING: case NOT_HANDSHAKING:
setHandshakeSuccess(channel);
wrap(ctx, channel); wrap(ctx, channel);
break loop; break loop;
default: default:
@ -666,6 +664,10 @@ public class SslHandler extends FrameDecoder {
} }
private void setHandshakeSuccess(Channel channel) { private void setHandshakeSuccess(Channel channel) {
if (!handshaking) {
return;
}
synchronized (handshakeLock) { synchronized (handshakeLock) {
handshaking = false; handshaking = false;
handshaken = true; handshaken = true;
@ -674,6 +676,7 @@ public class SslHandler extends FrameDecoder {
handshakeFuture = newHandshakeFuture(channel); handshakeFuture = newHandshakeFuture(channel);
} }
} }
handshakeFuture.setSuccess(); handshakeFuture.setSuccess();
} }