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

Make test suite mostly pass by avoiding ClosedChannelException

Browse Source 
- SSL echo test still fails
This commit is contained in:
Trustin Lee 2012-07-07 15:34:14 +09:00
parent aea3ed85bd
commit 3a84b9dc71
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
transport/src/main/java/io/netty/channel/socket/aio/AioSocketChannel.java
View File

@ -29,6 +29,7 @@ import java.nio.ByteBuffer;
import java.nio.channels.AsynchronousChannelGroup;
import java.nio.channels.AsynchronousCloseException;
import java.nio.channels.AsynchronousSocketChannel;
import java.nio.channels.ClosedChannelException;
import java.nio.channels.CompletionHandler;
import java.nio.channels.NetworkChannel;
@ -117,7 +118,6 @@ public class AioSocketChannel extends AbstractAioChannel implements SocketChanne
return null;
} else if (remoteAddress() != null) {
return new Runnable() {
@Override
public void run() {
read();
@ -208,6 +208,12 @@ public class AioSocketChannel extends AbstractAioChannel implements SocketChanne
// Allow to have the next write pending
channel.flushing = false;
// Stop flushing if disconnected.
if (!channel.isActive()) {
return;
}
try {
// try to flush it again if nothing is left it will return fast here
channel.doFlushByteBuffer(buf);
@ -295,9 +301,8 @@ public class AioSocketChannel extends AbstractAioChannel implements SocketChanne
@Override
protected void failed0(Throwable t, AioSocketChannel channel) {
if (t instanceof AsynchronousCloseException) {
if (t instanceof ClosedChannelException) {
channel.closed = true;
// TODO: This seems wrong!
return;
}