svn commit: r1450056 - in /openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session: ServerUtil.java store/HashMapStore.java

[solomax]

Author: solomax
Date: Tue Feb 26 07:37:30 2013
New Revision: 1450056

URL: http://svn.apache.org/r1450056
Log:
Cluster: activeRoomsCount did not take into account the server quered, fixed

Modified:
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ServerUtil.java
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ServerUtil.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ServerUtil.java?rev=1450056&r1=1450055&r2=1450056&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ServerUtil.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/ServerUtil.java
 Tue Feb 26 07:37:30 2013
@@ -35,7 +35,6 @@ import org.springframework.beans.factory
  *
  */
 public class ServerUtil {
-       
        protected static final Logger log = Red5LoggerFactory.getLogger(
                        ServerUtil.class, OpenmeetingsVariables.webAppRootKey);
 
@@ -58,6 +57,7 @@ public class ServerUtil {
        public String getServerId() {
                return serverId;
        }
+       
        public void setServerId(String serverId) {
                this.serverId = serverId;
        }
@@ -70,7 +70,7 @@ public class ServerUtil {
                if (serverId == null) {
                        return null;
                }
-               if (currentServer != null && 
currentServer.getId().equals(serverId)) {
+               if (currentServer != null && 
serverId.equals(currentServer.getId().toString())) {
                        return currentServer;
                }
                currentServer = serverDao.get(Long.parseLong(serverId));
@@ -79,5 +79,4 @@ public class ServerUtil {
                }
                return currentServer;
        }
-       
 }

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java?rev=1450056&r1=1450055&r2=1450056&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java
 Tue Feb 26 07:37:30 2013
@@ -179,6 +179,13 @@ public class HashMapStore implements ICl
                HashSet<Long> rooms = new HashSet<Long>();
                for (Client cl : clientsByStreamId.values()) {
                        Long roomId = cl.getRoom_id();
+                       Server s = cl.getServer();
+                       if ((server == null && s != null) || (server != null && 
s == null)) {
+                               continue;
+                       }
+                       if (server != null && s != null && server.getId() != 
s.getId()) {
+                               continue;
+                       }
                        if (roomId != null && roomId > 0 && 
!rooms.contains(roomId)) {
                                rooms.add(roomId);
                        }