From 596b2f3f5d7ce1bcebd6417e3937580e540f907c Mon Sep 17 00:00:00 2001
From: Abdurrahman eker <abdurrahmaneker58@gmail.com>
Date: Tue, 5 Nov 2019 13:33:56 +0300
Subject: [PATCH] Openfire 86520 discourse resolved, MUC clustering fixed

---
 .../java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java
index 1e49cfd5c2..ff3f2301e5 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java
@@ -582,7 +582,8 @@ public MUCRole joinRoom(String nickname, String password, HistoryRequest history
                 // Is this client already joined with this nickname?
                 for (MUCRole mucRole : occupants) {
                     if (mucRole.getUserAddress().equals(user.getAddress())) {
-                        clientOnlyJoin = true;
+                        if (occupantsByFullJID.get(user.getAddress()) != null)
+                            clientOnlyJoin = true;
                         break;
                     }
                 }