From d93d214f0eda649be34d6cc3f616ead74d46ee49 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Tue, 7 Nov 2017 20:13:46 +0100
Subject: [PATCH] Remove duplicate code in MultiUserChat

---
 .../org/jivesoftware/smackx/muc/MultiUserChat.java   | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
index 5b495305f..0990d5395 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
@@ -737,9 +737,6 @@ public class MultiUserChat {
         leavePresence.setTo(JidCreate.fullFrom(room, nickname));
         connection.sendStanza(leavePresence);
         // Reset occupant information.
-        occupantsMap.clear();
-        nickname = null;
-        joined = false;
         userHasLeft();
     }
 
@@ -881,9 +878,6 @@ public class MultiUserChat {
         connection.createStanzaCollectorAndSend(iq).nextResultOrThrow();
 
         // Reset occupant information.
-        occupantsMap.clear();
-        nickname = null;
-        joined = false;
         userHasLeft();
     }
 
@@ -2024,6 +2018,9 @@ public class MultiUserChat {
      * Remove all callbacks and resources necessary when the user has left the room for some reason.
      */
     private synchronized void userHasLeft() {
+        occupantsMap.clear();
+        nickname = null;
+        joined = false;
         // Update the list of joined rooms
         multiUserChatManager.removeJoinedRoom(room);
         removeConnectionCallbacks();
@@ -2341,14 +2338,11 @@ public class MultiUserChat {
         if (statusCodes.contains(Status.KICKED_307)) {
             // Check if this occupant was kicked
             if (isUserModification) {
-                joined = false;
                 for (UserStatusListener listener : userStatusListeners) {
                     listener.kicked(mucUser.getItem().getActor(), mucUser.getItem().getReason());
                 }
 
                 // Reset occupant information.
-                occupantsMap.clear();
-                nickname = null;
                 userHasLeft();
             }
             else {