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

Fixed another dead lock in SslHandler

Browse Source
This commit is contained in:
Trustin Lee 2009-07-15 14:39:54 +00:00
parent ea81870a28
commit 827effe4e2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -757,7 +757,11 @@ public class SslHandler extends FrameDecoder implements ChannelDownstreamHandler
// current thread, calling wrap() will lead to a dead lock
// i.e. pendingUnencryptedWrites -> handshakeLock vs.
// handshakeLock -> pendingUnencryptedLock -> handshakeLock
if (!Thread.holdsLock(handshakeLock)) {
//
// There is also a same issue between pendingEncryptedWrites
// and pendingUnencryptedWrites.
if (!Thread.holdsLock(handshakeLock) &&
!Thread.holdsLock(pendingEncryptedWrites)) {
wrap(ctx, channel);
}
}