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

Fixed issue: NETTY-40 (SslHandler dead lock on Oio-Oio communication)

Browse Source 
* More fine-grained lock acquisition
This commit is contained in:
Trustin Lee 2008-08-29 00:23:47 +00:00
parent 57c76d348d
commit 8da05713fe
2 changed files with 6 additions and 7 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

@ -385,6 +385,12 @@ public class SslHandler extends FrameDecoder implements ChannelDownstreamHandler
return;
}
synchronized (pendingEncryptedWrites) {
if (pendingEncryptedWrites.isEmpty()) {
return;
}
}
synchronized (pendingEncryptedWrites) {
MessageEvent e;
while ((e = pendingEncryptedWrites.poll()) != null) {

7
src/test/java/org/jboss/netty/handler/ssl/OioOioSocketSslEchoTest.java
View File

@ -27,7 +27,6 @@ import java.util.concurrent.Executor;
import org.jboss.netty.channel.ChannelFactory;
import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
import org.junit.Test;
/**
* @author The Netty Project (netty-dev@lists.jboss.org)
@ -47,10 +46,4 @@ public class OioOioSocketSslEchoTest extends AbstractSocketSslEchoTest {
protected ChannelFactory newServerSocketChannelFactory(Executor executor) {
return new OioServerSocketChannelFactory(executor, executor);
}
@Test
@Override
public void testSslEcho() throws Throwable {
// FIXME Disabled temporarily
}
}