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

Upgrading to the latest Netty 4.1 branch.

This commit is contained in:
nmittler 2015-03-31 12:35:50 -07:00
parent 9bd31daee6
commit 11d0094e04
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/netty

@ -1 +1 @@
Subproject commit 44615f6cb2d1ab3e7c2f7bac63ae1a76b290bc34 Subproject commit ba9f2143030d1b781724f04adaac254af3326930

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

@ -102,13 +102,13 @@ class NettyClientHandler extends Http2ConnectionHandler {
initListener(); initListener();
// Disallow stream creation by the server. // Disallow stream creation by the server.
connection.remote().maxStreams(0); connection.remote().maxActiveStreams(0);
connection.local().allowPushTo(false); connection.local().allowPushTo(false);
// Observe the HTTP/2 connection for events. // Observe the HTTP/2 connection for events.
connection.addListener(new Http2ConnectionAdapter() { connection.addListener(new Http2ConnectionAdapter() {
@Override @Override
public void streamInactive(Http2Stream stream) { public void onStreamClosed(Http2Stream stream) {
// Whenever a stream has been closed, try to create a pending stream to fill its place. // Whenever a stream has been closed, try to create a pending stream to fill its place.
createPendingStreams(); createPendingStreams();
} }
@ -364,12 +364,12 @@ class NettyClientHandler extends Http2ConnectionHandler {
return; return;
} }
if (connection.isGoAway()) { if (connection.goAwaySent() || connection.goAwayReceived()) {
failPendingStreams(goAwayStatus); failPendingStreams(goAwayStatus);
return; return;
} }
if (!local.acceptingNewStreams()) { if (!local.canCreateStream()) {
// We're bumping up against the MAX_CONCURRENT_STEAMS threshold for this endpoint. Need to // We're bumping up against the MAX_CONCURRENT_STEAMS threshold for this endpoint. Need to
// wait until the endpoint is accepting new streams. // wait until the endpoint is accepting new streams.
return; return;

4
netty/src/main/java/io/grpc/transport/netty/NettyClientTransport.java
View File

@ -63,8 +63,8 @@ import io.netty.handler.codec.http2.Http2Headers;
import io.netty.handler.codec.http2.Http2InboundFrameLogger; import io.netty.handler.codec.http2.Http2InboundFrameLogger;
import io.netty.handler.codec.http2.Http2OutboundFrameLogger; import io.netty.handler.codec.http2.Http2OutboundFrameLogger;
import io.netty.handler.codec.http2.Http2StreamRemovalPolicy; import io.netty.handler.codec.http2.Http2StreamRemovalPolicy;
import io.netty.handler.logging.LogLevel;
import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslContext;
import io.netty.util.internal.logging.InternalLogLevel;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.SocketAddress; import java.net.SocketAddress;
@ -334,7 +334,7 @@ class NettyClientTransport implements ClientTransport {
Http2FrameReader frameReader = new DefaultHttp2FrameReader(); Http2FrameReader frameReader = new DefaultHttp2FrameReader();
Http2FrameWriter frameWriter = new DefaultHttp2FrameWriter(); Http2FrameWriter frameWriter = new DefaultHttp2FrameWriter();
Http2FrameLogger frameLogger = new Http2FrameLogger(InternalLogLevel.DEBUG); Http2FrameLogger frameLogger = new Http2FrameLogger(LogLevel.DEBUG);
frameReader = new Http2InboundFrameLogger(frameReader, frameLogger); frameReader = new Http2InboundFrameLogger(frameReader, frameLogger);
frameWriter = new Http2OutboundFrameLogger(frameWriter, frameLogger); frameWriter = new Http2OutboundFrameLogger(frameWriter, frameLogger);

4
netty/src/main/java/io/grpc/transport/netty/NettyServerTransport.java
View File

@ -51,8 +51,8 @@ import io.netty.handler.codec.http2.Http2FrameWriter;
import io.netty.handler.codec.http2.Http2InboundFrameLogger; import io.netty.handler.codec.http2.Http2InboundFrameLogger;
import io.netty.handler.codec.http2.Http2OutboundFrameLogger; import io.netty.handler.codec.http2.Http2OutboundFrameLogger;
import io.netty.handler.codec.http2.Http2StreamRemovalPolicy; import io.netty.handler.codec.http2.Http2StreamRemovalPolicy;
import io.netty.handler.logging.LogLevel;
import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslContext;
import io.netty.util.internal.logging.InternalLogLevel;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@ -60,7 +60,7 @@ import javax.annotation.Nullable;
* The Netty-based server transport. * The Netty-based server transport.
*/ */
class NettyServerTransport extends AbstractService { class NettyServerTransport extends AbstractService {
private static final Http2FrameLogger frameLogger = new Http2FrameLogger(InternalLogLevel.DEBUG); private static final Http2FrameLogger frameLogger = new Http2FrameLogger(LogLevel.DEBUG);
private final Channel channel; private final Channel channel;
private final ServerListener serverListener; private final ServerListener serverListener;
private final SslContext sslContext; private final SslContext sslContext;

2
netty/src/test/java/io/grpc/transport/netty/NettyClientHandlerTest.java
View File

@ -177,7 +177,7 @@ public class NettyClientHandlerTest extends NettyHandlerTestBase {
@Test @Test
public void cancelBeforeStreamAssignedShouldSucceed() throws Exception { public void cancelBeforeStreamAssignedShouldSucceed() throws Exception {
handler.connection().local().maxStreams(0); handler.connection().local().maxActiveStreams(0);
handler.write(ctx, new CreateStreamCommand(grpcHeaders, stream), promise); handler.write(ctx, new CreateStreamCommand(grpcHeaders, stream), promise);
mockContext(); mockContext();
verify(stream, never()).id(any(Integer.class)); verify(stream, never()).id(any(Integer.class));