1. Fixed kicking of idle users.

2. Removal of old entries in surrogates cache is done more frequently.


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@210 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/messenger/muc/spi/MultiUserChatServerImpl.java

@@ -67,6 +67,10 @@ public class MultiUserChatServerImpl extends BasicModule implements MultiUserCha
      * The time to elapse between clearing of idle chat users.
      */
     private static int USER_TIMEOUT = 300000;
+    /**
+     * The number of milliseconds a user must be idle before he/she gets kicked from all the rooms.
+     */
+    private static int USER_IDLE = 1800000;
     /**
      * The time to elapse between logging the room conversations.
      */
@@ -179,18 +183,30 @@ public class MultiUserChatServerImpl extends BasicModule implements MultiUserCha
     }
 
     private void checkForTimedOutUsers() throws ConcurrentModificationException {
-        final long deadline = System.currentTimeMillis() - USER_TIMEOUT;
+        // 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;
         final Map userMap = new HashMap(users);
         final Iterator userIter = userMap.values().iterator();
         while (userIter.hasNext()) {
             try {
                 MUCUser user = (MUCUser) userIter.next();
                 if (user.getLastPacketTime() < deadline) {
-                    // TODO If the idea is to remove the user...this code does not do that. Maybe we
-                    // can just simulate that the user sent an unavailable presence to each room 
-                    // that he/she previously joined
-                    // TODO Analyze the side effect caused by PresenceManager.probePresence
-                    presenceManager.probePresence(chatServiceAddress, user.getAddress());
+                    // Kick the user from all the rooms that he/she had previuosly joined
+                    Iterator<MUCRole> roles = user.getRoles();
+                    MUCRole role;
+                    while (roles.hasNext()) {
+                        role = roles.next();
+                        try {
+                            role.getChatRoom().kickOccupant(user.getAddress().toStringPrep(), null,
+                                    null);
+                        }
+                        catch (NotAllowedException e) {
+                            // Do nothing since we cannot kick owners or admins
+                        }
+                    }
                 }
             }
             catch (Exception e) {
@@ -301,6 +317,10 @@ public class MultiUserChatServerImpl extends BasicModule implements MultiUserCha
             if (room.isPersistent()) {
                 persistentRoomSurrogateCache.clear();
             }
+            else {
+                // Just force to expire old entries since the cache doesn't have a clean-up thread
+                persistentRoomSurrogateCache.size();
+            }
             rooms.remove(roomName.toLowerCase());
         }
     }
@@ -466,6 +486,15 @@ public class MultiUserChatServerImpl extends BasicModule implements MultiUserCha
                 Log.error("Wrong number format of property xmpp.muc.tasks.user.timeout", e);
             }
         }
+        value = JiveGlobals.getProperty("xmpp.muc.tasks.user.idle");
+        if (value != null) {
+            try {
+                USER_IDLE = Integer.parseInt(value);
+            }
+            catch (NumberFormatException e) {
+                Log.error("Wrong number format of property xmpp.muc.tasks.user.idle", e);
+            }
+        }
         value = JiveGlobals.getProperty("xmpp.muc.tasks.log.timeout");
         if (value != null) {
             try {