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

Fixed NPE in LocalChannel.closeNow()

Browse Source
This commit is contained in:
Trustin Lee 2009-02-09 09:06:39 +00:00
parent f513e0d6ae
commit f7cc2c971d
1 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/main/java/org/jboss/netty/channel/local/LocalChannel.java
View File

@ -109,7 +109,7 @@ class LocalChannel extends AbstractChannel {
fireChannelClosed(this);
// Close the peer.
if (!pairedChannel.setClosed()) {
if (pairedChannel == null || !pairedChannel.setClosed()) {
return;
}
@ -130,26 +130,9 @@ class LocalChannel extends AbstractChannel {
void flushWriteBuffer() {
LocalChannel pairedChannel = this.pairedChannel;
if (pairedChannel == null || !pairedChannel.isConnected()) {
// Channel is closed or not connected yet - notify as failures.
Exception cause;
if (isOpen()) {
cause = new NotYetConnectedException();
} else {
cause = new ClosedChannelException();
}
for (;;) {
MessageEvent e = writeBuffer.poll();
if(e == null) {
break;
}
e.getFuture().setFailure(cause);
fireExceptionCaught(this, cause);
}
} else {
// Channel is open and connected - trigger events.
if (isConnected()){
// Channel is open and connected and channelConnected event has
// been fired.
if (!delivering.get()) {
delivering.set(true);
try {
@ -167,6 +150,34 @@ class LocalChannel extends AbstractChannel {
delivering.set(false);
}
}
return;
}
if (pairedChannel != null) {
// Channel is open and connected but channelConnected event has
// not been fired yet.
return;
}
if (pairedChannel == null || !isOpen()) {
// Channel is closed or not connected yet - notify as failures.
Exception cause;
if (isOpen()) {
cause = new NotYetConnectedException();
} else {
cause = new ClosedChannelException();
}
for (;;) {
MessageEvent e = writeBuffer.poll();
if(e == null) {
break;
}
e.getFuture().setFailure(cause);
fireExceptionCaught(this, cause);
}
}
}
}