Pulled over fix for JM-1251 to 3.4.5 release.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/branches@9800 b35dd754-fafc-0310-a699-88a17e54d16e

openfire_3_4_5/documentation/dist/changelog.html

@@ -172,6 +172,7 @@ hr {
 
 <h3>Openfire Bug Fixes</h3>
 <ul>
+<li>[<a href='http://www.igniterealtime.org/issues/browse/JM-1251'>JM-1251</a>] - Fixed small memory leak in Multi User Chat.</li>
 <li>[<a href='http://www.igniterealtime.org/issues/browse/JM-632'>JM-632</a>] - SSL settings pages now handle broken keystores without crashing.</li>
 <li>[<a href='http://www.igniterealtime.org/issues/browse/JM-703'>JM-703</a>] - LDAP settings (particularly search filters) will no longer get corrupted upon saving.</li>
 <li>[<a href='http://www.igniterealtime.org/issues/browse/JM-1248'>JM-1248</a>] - RPM is no longer throwing warnings about ci and jivedev users.</li>

openfire_3_4_5/src/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServerImpl.java

@@ -327,20 +327,20 @@ public class MultiUserChatServerImpl extends BasicModule implements MultiUserCha
     }
 
     private void checkForTimedOutUsers() {
-        // Do nothing if this feature is disabled (i.e USER_IDLE equals -1)
-        if (user_idle == -1) {
-            return;
-        }
         final long deadline = System.currentTimeMillis() - user_idle;
         for (LocalMUCUser user : users.values()) {
             try {
+                // If user is not present in any room then remove the user from
+                // the list of users
+                if (!user.isJoined()) {
+                    removeUser(user.getAddress());
+                    continue;
+                }
+                // Do nothing if this feature is disabled (i.e USER_IDLE equals -1)
+                if (user_idle == -1) {
+                    return;
+                }
                 if (user.getLastPacketTime() < deadline) {
-                    // If user is not present in any room then remove the user from
-                    // the list of users
-                    if (!user.isJoined()) {
-                        removeUser(user.getAddress());
-                        continue;
-                    }
                     // Kick the user from all the rooms that he/she had previuosly joined
                     MUCRoom room;
                     Presence kickedPresence;