From 90e39d34dd0e97373f1ddef37093d977e81835e2 Mon Sep 17 00:00:00 2001
From: md_li <md_li@trip.com>
Date: Mon, 15 Apr 2024 17:52:34 +0800
Subject: [PATCH] support kernel 6.x

---
 pom.xml                                                       | 4 ++--
 .../redis/proxy/integrate/AbstractProxyIntegrationTest.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7ced54ef15..7de218c451 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
         <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>
@@ -69,7 +69,7 @@
         <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>
diff --git a/redis/redis-proxy/src/test/java/com/ctrip/xpipe/redis/proxy/integrate/AbstractProxyIntegrationTest.java b/redis/redis-proxy/src/test/java/com/ctrip/xpipe/redis/proxy/integrate/AbstractProxyIntegrationTest.java
index 4f9f0fcae7..9c8d405817 100644
--- a/redis/redis-proxy/src/test/java/com/ctrip/xpipe/redis/proxy/integrate/AbstractProxyIntegrationTest.java
+++ b/redis/redis-proxy/src/test/java/com/ctrip/xpipe/redis/proxy/integrate/AbstractProxyIntegrationTest.java
@@ -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);
         }