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

[#1573] Fix NPE which could be triggered one failed promises that trigger a close89

Browse Source
This commit is contained in:
Norman Maurer 2013-07-12 22:57:03 +02:00
parent 2871079c4a
commit 2af7db361b
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
transport/src/main/java/io/netty/channel/ChannelOutboundBuffer.java
View File

@ -236,6 +236,13 @@ final class ChannelOutboundBuffer {
do {
if (currentMessages != null) {
// Store a local reference of current messages
// This is needed as a promise may have a listener attached that will close the channel
// The close will call next() which will set currentMessages to null and so
// trigger a NPE in the finally block if no local reference is used.
//
// See https://github.com/netty/netty/issues/1573
MessageList current = currentMessages;
// Release all failed messages.
Object[] messages = currentMessages.messages();
ChannelPromise[] promises = currentMessages.promises();
@ -249,7 +256,7 @@ final class ChannelOutboundBuffer {
}
}
} finally {
currentMessages.recycle();
current.recycle();
}
}
} while(next());