Skip to content

Commit

Permalink
Merge pull request #793 from ctripcorp/feature/arm-aws-and-ut
Browse files Browse the repository at this point in the history
support kernel 6.x
  • Loading branch information
LanternLee authored Apr 15, 2024
2 parents 2b6a211 + 90e39d3 commit b5a1d0b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@
<qunaer.common.version>9.2.37</qunaer.common.version>
<qconfig.client.version>1.100.46-ctrip</qconfig.client.version>
<qtracer.version>1.2.4</qtracer.version>
<netty.boringssl.version>2.0.36.Final</netty.boringssl.version>
<netty.boringssl.version>2.0.61.Final</netty.boringssl.version>
<netty4.version>4.1.28.Final</netty4.version>
<zstd.version>1.3.6-1</zstd.version>
<jackson.version>2.10.3</jackson.version>
<jedis.version>2.8.1.4-ctrip</jedis.version>
<soa.version>2.21.17</soa.version>
<sso.version>0.1.3</sso.version>
<vi.version>0.11.49</vi.version>
<dal.version>2.4.43</dal.version>
<dal.version>2.4.50</dal.version>
<ucs.version>0.3.4</ucs.version>
<artemis.version>1.9.6</artemis.version>
<caravan.version>1.17.13</caravan.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ public ReceiveHandler(AtomicReference<ByteBuf> buffer) {
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
ByteBuf byteBuf = (ByteBuf) msg;
byteBuf.retain();
cumulator.cumulate(ctx.channel().alloc(), cumulation, byteBuf);
cumulation = cumulator.cumulate(ctx.channel().alloc(), cumulation, byteBuf);
buffer.set(cumulation);
super.channelRead(ctx, msg);
}
Expand Down

0 comments on commit b5a1d0b

Please sign in to comment.