openmeetings-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From solo...@apache.org
Subject svn commit: r1442477 - /openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
Date Tue, 05 Feb 2013 06:11:21 GMT
Author: solomax
Date: Tue Feb  5 06:11:20 2013
New Revision: 1442477

URL: http://svn.apache.org/viewvc?rev=1442477&view=rev
Log:
SIP: getActiveRoomIds is fixed to correctly return empty list

Modified:
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1442477&r1=1442476&r2=1442477&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
Tue Feb  5 06:11:20 2013
@@ -2785,7 +2785,7 @@ public class ScopeApplicationAdapter ext
 		for (Server s : serverDao.getActiveServers()) {
 			result.addAll(getVerifiedActiveRoomIds(s));
 		}
-		return roomDao.getSipRooms(result);
+		return result.isEmpty() ? result : roomDao.getSipRooms(result);
 	}
 	
     public synchronized void updateSipTransport() {



Mime
View raw message