From 37cbf9f80cfa60491ab6c5ecdb8099d008abcfb7 Mon Sep 17 00:00:00 2001
From: zhenghu <huzheng_huang@163.com>
Date: Mon, 4 Nov 2019 16:57:26 +0800
Subject: [PATCH] =?UTF-8?q?[#1568]=20rocketmq=20need=20enhance=20stability?=
 =?UTF-8?q?=20when=20commitlog=20broken=20=20=E5=A2=9E=E5=8A=A0=E9=9D=9E?=
 =?UTF-8?q?=E7=A9=BA=E5=88=A4=E6=96=AD=EF=BC=8C=E9=98=B2=E6=AD=A2=E7=A9=BA?=
 =?UTF-8?q?=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8,=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E4=BA=8B=E5=8A=A1=20check?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../broker/transaction/queue/TransactionalMessageBridge.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageBridge.java b/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageBridge.java
index 84a62761..ef92fbcd 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageBridge.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageBridge.java
@@ -176,7 +176,9 @@ public class TransactionalMessageBridge {
             List<ByteBuffer> messageBufferList = getMessageResult.getMessageBufferList();
             for (ByteBuffer bb : messageBufferList) {
                 MessageExt msgExt = MessageDecoder.decode(bb);
-                foundList.add(msgExt);
+                if(msgExt != null){
+                    foundList.add(msgExt);
+                }
             }
 
         } finally {
-- 
GitLab