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

[#1501] Fix NPE which could accour if ChannelOutboundBuffer.fail(..) triggered another call to ChannelOutboundBuffer.fail(...)

Browse Source
This commit is contained in:
Norman Maurer 2013-07-02 09:32:34 +02:00
parent 9633769909
commit 8dfbcbda29
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,6 +222,13 @@ final class ChannelOutboundBuffer {
do { do {
if (!(currentPromise instanceof VoidChannelPromise) && !currentPromise.tryFailure(cause)) { if (!(currentPromise instanceof VoidChannelPromise) && !currentPromise.tryFailure(cause)) {
logger.warn("Promise done already:", cause); logger.warn("Promise done already:", cause);
} else {
// We need to check for next here as the notification of the future may trigger some other event
// which will also call ChannelOutboundBuffer and so set currentMessage and currentPromise to null.
// See https://github.com/netty/netty/issues/1501
if (!next()) {
return;
}
} }
// Release all failed messages. // Release all failed messages.