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

Ensure we call promise.setUncancellable() before trying to process in DefaultHttp2StreamChannel.

Browse Source 
Motivation:

We should call promise.setUncancellable() in DefaultHttp2StreamChannel.Unsafe impl to detect if the operation was cancelled.

Modifications:

Add promise.setUncancellable() calls

Result:

More correct handling of cancelled promises
This commit is contained in:
Norman Maurer 2017-08-11 13:04:03 +02:00
parent 74f24a5c19
commit 08284dbbcd
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
codec-http2/src/main/java/io/netty/handler/codec/http2/Http2MultiplexCodec.java
View File

@ -756,6 +756,9 @@ public class Http2MultiplexCodec extends Http2FrameCodec {
@Override
public void connect(final SocketAddress remoteAddress,
SocketAddress localAddress, final ChannelPromise promise) {
if (!promise.setUncancellable()) {
return;
}
promise.setFailure(new UnsupportedOperationException());
}
@ -779,6 +782,9 @@ public class Http2MultiplexCodec extends Http2FrameCodec {
@Override
public void register(EventLoop eventLoop, ChannelPromise promise) {
if (!promise.setUncancellable()) {
return;
}
if (registered) {
throw new UnsupportedOperationException("Re-register is not supported");
}
@ -798,16 +804,25 @@ public class Http2MultiplexCodec extends Http2FrameCodec {
@Override
public void bind(SocketAddress localAddress, ChannelPromise promise) {
if (!promise.setUncancellable()) {
return;
}
promise.setFailure(new UnsupportedOperationException());
}
@Override
public void disconnect(ChannelPromise promise) {
if (!promise.setUncancellable()) {
return;
}
close(promise);
}
@Override
public void close(ChannelPromise promise) {
if (!promise.setUncancellable()) {
return;
}
if (closePromise.isDone()) {
promise.setFailure(new ClosedChannelException());
return;
@ -857,6 +872,9 @@ public class Http2MultiplexCodec extends Http2FrameCodec {
@Override
public void deregister(ChannelPromise promise) {
if (!promise.setUncancellable()) {
return;
}
if (registered) {
registered = true;
promise.setSuccess();
@ -922,18 +940,18 @@ public class Http2MultiplexCodec extends Http2FrameCodec {
@Override
public void write(Object msg, final ChannelPromise promise) {
if (!isActive()) {
ReferenceCountUtil.release(msg);
promise.setFailure(CLOSED_CHANNEL_EXCEPTION);
return;
}
// After this point its not possible to cancel a write anymore.
if (!promise.setUncancellable()) {
ReferenceCountUtil.release(msg);
return;
}
if (!isActive()) {
ReferenceCountUtil.release(msg);
promise.setFailure(CLOSED_CHANNEL_EXCEPTION);
return;
}
try {
if (msg instanceof Http2StreamFrame) {
Http2StreamFrame frame = validateStreamFrame((Http2StreamFrame) msg).stream(stream());