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

[#807] SslHandler.handshake() need to respect ChannelFuture of wrapNonAppData(...)

Browse Source
This commit is contained in:
Norman Maurer 2012-12-13 16:47:50 +01:00
parent 07e0e158d9
commit 7278664c0b
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,6 +54,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import static org.jboss.netty.channel.Channels.*; import static org.jboss.netty.channel.Channels.*;
import static org.jboss.netty.channel.Channels.fireExceptionCaught;
/** /**
* Adds <a href="http://en.wikipedia.org/wiki/Transport_Layer_Security">SSL * Adds <a href="http://en.wikipedia.org/wiki/Transport_Layer_Security">SSL
@ -347,8 +348,8 @@ public class SslHandler extends FrameDecoder
throw new IllegalStateException("renegotiation disabled"); throw new IllegalStateException("renegotiation disabled");
} }
ChannelHandlerContext ctx = this.ctx; final ChannelHandlerContext ctx = this.ctx;
Channel channel = ctx.getChannel(); final Channel channel = ctx.getChannel();
ChannelFuture handshakeFuture; ChannelFuture handshakeFuture;
Exception exception = null; Exception exception = null;
@ -370,7 +371,20 @@ public class SslHandler extends FrameDecoder
if (exception == null) { // Began handshake successfully. if (exception == null) { // Began handshake successfully.
try { try {
wrapNonAppData(ctx, channel); final ChannelFuture hsFuture = handshakeFuture;
wrapNonAppData(ctx, channel).addListener(new ChannelFutureListener() {
public void operationComplete(ChannelFuture future) throws Exception {
if (!future.isSuccess()) {
Throwable cause = future.getCause();
hsFuture.setFailure(cause);
fireExceptionCaught(ctx, cause);
if (closeOnSSLException) {
Channels.close(ctx, future(channel));
}
}
}
});
} catch (SSLException e) { } catch (SSLException e) {
handshakeFuture.setFailure(e); handshakeFuture.setFailure(e);
@ -1104,6 +1118,7 @@ public class SslHandler extends FrameDecoder
needsHandshake = true; needsHandshake = true;
} }
} }
if (needsHandshake) { if (needsHandshake) {
handshake(); handshake();
} }