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

Not add inboundStreamHandler for outbound streams created by Http2MultiplexCodec.

Browse Source 
Motivation:

We must not add the inboundStreamHandler for outbound streams creates by Http2MultiplexCodec as the user will specify a handler via Http2StreamChannelBootstrap.

Modifications:

- Check if the stream is for outbound and if so not add the inboundStreamHandler to the pipeline
- Update tests so this is covered.

Result:

Fixes [#7178]
This commit is contained in:
Norman Maurer 2017-09-05 18:34:34 +01:00
parent 5c572f0f63
commit 870b5f5e4b
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -239,7 +239,7 @@ public class Http2MultiplexCodec extends Http2FrameCodec {
break; break;
} }
// fall-trough // fall-trough
DefaultHttp2StreamChannel childChannel = new DefaultHttp2StreamChannel(stream); DefaultHttp2StreamChannel childChannel = new DefaultHttp2StreamChannel(stream, false);
ChannelFuture future = ctx.channel().eventLoop().register(childChannel); ChannelFuture future = ctx.channel().eventLoop().register(childChannel);
if (future.isDone()) { if (future.isDone()) {
registerDone(future); registerDone(future);
@ -266,7 +266,7 @@ public class Http2MultiplexCodec extends Http2FrameCodec {
// TODO: This is most likely not the best way to expose this, need to think more about it. // TODO: This is most likely not the best way to expose this, need to think more about it.
final Http2StreamChannel newOutboundStream() { final Http2StreamChannel newOutboundStream() {
return new DefaultHttp2StreamChannel(newStream()); return new DefaultHttp2StreamChannel(newStream(), true);
} }
@Override @Override
@ -403,6 +403,7 @@ public class Http2MultiplexCodec extends Http2FrameCodec {
private final ChannelPipeline pipeline; private final ChannelPipeline pipeline;
private final Http2FrameStream stream; private final Http2FrameStream stream;
private final ChannelPromise closePromise; private final ChannelPromise closePromise;
private final boolean outbound;
private volatile boolean registered; private volatile boolean registered;
private volatile boolean writable; private volatile boolean writable;
@ -427,8 +428,9 @@ public class Http2MultiplexCodec extends Http2FrameCodec {
// channelReadComplete(...) // channelReadComplete(...)
DefaultHttp2StreamChannel next; DefaultHttp2StreamChannel next;
DefaultHttp2StreamChannel(Http2FrameStream stream) { DefaultHttp2StreamChannel(Http2FrameStream stream, boolean outbound) {
this.stream = stream; this.stream = stream;
this.outbound = outbound;
((Http2MultiplexCodecStream) stream).channel = this; ((Http2MultiplexCodecStream) stream).channel = this;
pipeline = new DefaultChannelPipeline(this) { pipeline = new DefaultChannelPipeline(this) {
@Override @Override
@ -791,8 +793,10 @@ public class Http2MultiplexCodec extends Http2FrameCodec {
registered = true; registered = true;
// Add the handler to the pipeline now that we are registered. if (!outbound) {
pipeline().addLast(inboundStreamHandler); // Add the handler to the pipeline now that we are registered.
pipeline().addLast(inboundStreamHandler);
}
promise.setSuccess(); promise.setSuccess();

8
codec-http2/src/test/java/io/netty/handler/codec/http2/Http2MultiplexCodecBuilderTest.java
View File

@ -32,6 +32,7 @@ import io.netty.channel.local.LocalChannel;
import io.netty.channel.local.LocalServerChannel; import io.netty.channel.local.LocalServerChannel;
import org.junit.After; import org.junit.After;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
@ -82,7 +83,12 @@ public class Http2MultiplexCodecBuilderTest {
Bootstrap cb = new Bootstrap() Bootstrap cb = new Bootstrap()
.channel(LocalChannel.class) .channel(LocalChannel.class)
.group(group) .group(group)
.handler(new Http2MultiplexCodecBuilder(false, new TestChannelInitializer()).build()); .handler(new Http2MultiplexCodecBuilder(false, new ChannelInitializer<Channel>() {
@Override
protected void initChannel(Channel ch) throws Exception {
Assert.fail("Should not be called for outbound streams");
}
}).build());
clientChannel = cb.connect(serverAddress).sync().channel(); clientChannel = cb.connect(serverAddress).sync().channel();
assertTrue(serverChannelLatch.await(5, SECONDS)); assertTrue(serverChannelLatch.await(5, SECONDS));
} }