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

Merge pull request #648 from alex-berger/ssl_handler

Browse Source 
Fix race in SslHandler
This commit is contained in:
Norman Maurer 2012-10-10 06:08:30 -07:00
commit 92a68f59be
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
handler/src/main/java/io/netty/handler/ssl/SslHandler.java
View File

@ -300,10 +300,11 @@ public class SslHandler
} }
SSLException e = new SSLException("handshake timed out"); SSLException e = new SSLException("handshake timed out");
future.setFailure(e); if ( future.setFailure(e) ){
ctx.fireExceptionCaught(e); ctx.fireExceptionCaught(e);
ctx.close(); ctx.close();
} }
}
}, handshakeTimeoutMillis, TimeUnit.MILLISECONDS); }, handshakeTimeoutMillis, TimeUnit.MILLISECONDS);
} else { } else {
timeoutFuture = null; timeoutFuture = null;
@ -320,11 +321,12 @@ public class SslHandler
handshakeFutures.add(future); handshakeFutures.add(future);
flush(ctx, ctx.newFuture()); flush(ctx, ctx.newFuture());
} catch (Exception e) { } catch (Exception e) {
future.setFailure(e); if ( future.setFailure(e) ) {
ctx.fireExceptionCaught(e); ctx.fireExceptionCaught(e);
ctx.close(); ctx.close();
} }
} }
}
}); });
return future; return future;