Skip to content

netty: Port client and server handler to frame codec. #2332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
buchgr wants to merge 3 commits into
base: master
Choose a base branch
from
Open

netty: Port client and server handler to frame codec. #2332

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b8dd11
netty: Port client and server handler to frame codec.
buchgr Sep 22, 2016
528195b
Incorporate changes to Netty
buchgr Oct 18, 2016
aaaa3fd
Incorporate Netty changes
buchgr Oct 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Incorporate changes to Netty
  • Loading branch information
@buchgr
buchgr committed Oct 18, 2016
commit 528195b89dcfa402d33c3b3be492e7c37e635aeb
2 changes: 1 addition & 1 deletion netty/src/main/java/io/grpc/netty/AbstractNettyHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ private void setPinging(boolean pingOut) {
private void sendPing() {
setDataSizeSincePing(0);
lastPingTime = System.nanoTime();
ctx().write(new DefaultHttp2PingFrame(payloadBuf.slice(), false));
ctx().write(new DefaultHttp2PingFrame(payloadBuf.slice()));
pingCount++;
}

Expand Down
4 changes: 2 additions & 2 deletions netty/src/main/java/io/grpc/netty/NettyClientHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ static NettyClientHandler newHandler(Http2Connection connection,
.frameLogger(frameLogger)
.frameReader(frameReader)
.frameWriter(frameWriter)
.bufferOutgoingStreams(true)
.bufferOutboundStreams(true)
.initialSettings(settings);

return new NettyClientHandler(frameCodecBuilder, flowControlWindow, lifecycleManager, ticker);
Expand Down Expand Up @@ -439,7 +439,7 @@ private void sendPingFrame(ChannelHandlerContext ctx, SendPingCommand msg,
ping = new Http2Ping(USER_PING_PAYLOAD, stopwatch);
ping.addCallback(callback, executor);
// and then write the ping
ctx.write(new DefaultHttp2PingFrame(userPayloadBuf.slice(), false), promise);
ctx.write(new DefaultHttp2PingFrame(userPayloadBuf.slice()), promise);
ctx.flush();
final Http2Ping finalPing = ping;
promise.addListener(new ChannelFutureListener() {
Expand Down