grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updating to the latest Netty version. 

Also re-enabling the gracefulShutdown test now that Netty has been
fixed.
This commit is contained in:
nmittler 2015-05-05 15:36:23 -07:00
parent 041cdb11ed
commit ef6a2f02d4
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
integration-testing/src/main/java/io/grpc/testing/integration/AbstractTransportTest.java
View File

@ -572,7 +572,6 @@ public abstract class AbstractTransportTest {
return 10485760; return 10485760;
} }
@org.junit.Ignore
@Test(timeout = 10000) @Test(timeout = 10000)
public void gracefulShutdown() throws Exception { public void gracefulShutdown() throws Exception {
final List<StreamingOutputCallRequest> requests = Arrays.asList( final List<StreamingOutputCallRequest> requests = Arrays.asList(

2
lib/netty

@ -1 +1 @@
Subproject commit a3cea186ce559037b8cf04ea272f09908657e9e3 Subproject commit 4ae8bdc6ec8d37106f386a7d667a9cd279a8f5d8

2
netty/src/main/java/io/grpc/transport/netty/NettyClientHandler.java
View File

@ -294,7 +294,7 @@ class NettyClientHandler extends Http2ConnectionHandler {
*/ */
private void goingAway() { private void goingAway() {
final Status goAwayStatus = goAwayStatus(); final Status goAwayStatus = goAwayStatus();
final int lastKnownStream = connection().local().lastKnownStream(); final int lastKnownStream = connection().local().lastStreamKnownByPeer();
try { try {
connection().forEachActiveStream(new Http2StreamVisitor() { connection().forEachActiveStream(new Http2StreamVisitor() {
@Override @Override