From 9aac87b7a1ec9add4c0c67e2c47561bca403d239 Mon Sep 17 00:00:00 2001
From: heavyrian2012 <heavyrain.lee@wildfirehat.cn>
Date: Tue, 23 Apr 2024 14:17:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=89=E5=8F=96=E6=B6=88=E6=81=AF=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=A4=84=E7=90=86=E9=87=8D=E5=A4=8D=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/moquette/persistence/DatabaseStore.java   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/broker/src/main/java/io/moquette/persistence/DatabaseStore.java b/broker/src/main/java/io/moquette/persistence/DatabaseStore.java
index 8815d555..63bc6687 100644
--- a/broker/src/main/java/io/moquette/persistence/DatabaseStore.java
+++ b/broker/src/main/java/io/moquette/persistence/DatabaseStore.java
@@ -1136,7 +1136,16 @@ public class DatabaseStore {
                 }
 
                 if (!expired) {
-                    messages.add(message);
+                    boolean duplicated = false;
+                    for (WFCMessage.Message msg : messages) {
+                        if(message.getMessageId() == msg.getMessageId()) {
+                            duplicated = true;
+                            break;
+                        }
+                    }
+                    if(!duplicated) {
+                        messages.add(message);
+                    }
                 }
             }