svn commit: r1405090 - /incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/ClientListHashMapStore.java

[sebawagner]

Author: sebawagner
Date: Fri Nov  2 18:27:24 2012
New Revision: 1405090

URL: http://svn.apache.org/viewvc?rev=1405090&view=rev
Log:
OPENMEETINGS-460 unify acces to get clients by roomId

Modified:
    
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/ClientListHashMapStore.java

Modified: 
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/ClientListHashMapStore.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/ClientListHashMapStore.java?rev=1405090&r1=1405089&r2=1405090&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/ClientListHashMapStore.java
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/conference/room/ClientListHashMapStore.java
 Fri Nov  2 18:27:24 2012
@@ -395,15 +395,11 @@ public class ClientListHashMapStore impl
         * (java.lang.Long)
         */
        public synchronized List<RoomClient> getCurrentModeratorByRoom(Long 
room_id) {
-
                List<RoomClient> rclList = new LinkedList<RoomClient>();
+               List<RoomClient> currentClients = 
this.getClientListByRoom(room_id);
                // FIXME: Enhance performance by using multiple lists
-               for (ClientSession cSession : clientList.values()) {
-                       // log.debug("getClientList key: "+key);
-                       RoomClient rcl = cSession.getRoomClient();
-                       // Check if the Client is in the same room
-                       if (room_id != null && room_id.equals(rcl.getRoom_id())
-                                       && rcl.getIsMod()) {
+               for (RoomClient rcl : currentClients) {
+                       if (rcl.getIsMod()) {
                                log.debug("found client who is the Moderator: " 
+ rcl);
                                rclList.add(rcl);
                        }