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

HTTP/2 InboundHttp2ToHttpAdapterTest serverChannel NPE

Browse Source 
Motivation:
InboundHttp2ToHttpAdapterTest.bootstrapEnv does not wait for the serverConnectedChannel to be initialized before returning. Some methods rely only this behavior and throw a NPE because it may not be set.

Modifications:
- Add a CountDownLatch to ensure the serverConnectedChannel is initialized

Result:
No more NPE.
This commit is contained in:
Scott Mitchell 2015-08-31 12:37:24 -07:00
parent 0736a3bc35
commit 41ee9148e5
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
codec-http2/src/test/java/io/netty/handler/codec/http2/InboundHttp2ToHttpAdapterTest.java
View File

@ -639,6 +639,7 @@ public class InboundHttp2ToHttpAdapterTest {
serverDelegator = null; serverDelegator = null;
serverConnectedChannel = null; serverConnectedChannel = null;
maxContentLength = 1024; maxContentLength = 1024;
final CountDownLatch serverChannelLatch = new CountDownLatch(1);
serverLatch = new CountDownLatch(serverLatchCount); serverLatch = new CountDownLatch(serverLatchCount);
clientLatch = new CountDownLatch(clientLatchCount); clientLatch = new CountDownLatch(clientLatchCount);
settingsLatch = new CountDownLatch(settingsLatchCount); settingsLatch = new CountDownLatch(settingsLatchCount);
@ -681,6 +682,7 @@ public class InboundHttp2ToHttpAdapterTest {
} }
} }
}); });
serverChannelLatch.countDown();
} }
}); });
@ -709,6 +711,7 @@ public class InboundHttp2ToHttpAdapterTest {
ChannelFuture ccf = cb.connect(serverChannel.localAddress()); ChannelFuture ccf = cb.connect(serverChannel.localAddress());
assertTrue(ccf.awaitUninterruptibly().isSuccess()); assertTrue(ccf.awaitUninterruptibly().isSuccess());
clientChannel = ccf.channel(); clientChannel = ccf.channel();
assertTrue(serverChannelLatch.await(2, SECONDS));
} }
private void cleanupCapturedRequests() { private void cleanupCapturedRequests() {