From 24e95ea4db766a79d40be540c34eaee9adef2131 Mon Sep 17 00:00:00 2001
From: heavyrain2012 <heavyrain.lee@gmail.com>
Date: Wed, 22 Dec 2021 10:27:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=81=8A=E5=A4=A9=E5=AE=A4?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E8=81=8A=E5=A4=A9=E5=AE=A4=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E9=94=80=E6=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/moquette/persistence/MemoryMessagesStore.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
index cd8cb2ba..65d3eb6c 100755
--- a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
+++ b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
@@ -3202,7 +3202,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     @Override
     public ErrorCode handleJoinChatroom(String userId, String clientId, String chatroomId) {
         IMap<String, WFCMessage.ChatroomInfo> chatroomInfoMap = m_Server.getHazelcastInstance().getMap(CHATROOMS);
-        if (chatroomInfoMap == null || chatroomInfoMap.get(chatroomId) == null) {
+        if (chatroomInfoMap == null || chatroomInfoMap.get(chatroomId) == null || chatroomInfoMap.get(chatroomId).getState() == ProtoConstants.ChatroomState.Chatroom_State_End) {
             if(mChatroomCreateWhenNotExist) {
                 WFCMessage.ChatroomInfo.Builder builder = WFCMessage.ChatroomInfo.newBuilder().setTitle(chatroomId);
                 createChatroom(chatroomId, builder.build());