You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2012/12/20 07:13:59 UTC
svn commit: r1424338 -
/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
Author: solomax
Date: Thu Dec 20 06:13:59 2012
New Revision: 1424338
URL: http://svn.apache.org/viewvc?rev=1424338&view=rev
Log:
SIP: method to get ids of active rooms is added
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1424338&r1=1424337&r2=1424338&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java Thu Dec 20 06:13:59 2012
@@ -47,6 +47,7 @@ import org.apache.openmeetings.data.logs
import org.apache.openmeetings.data.user.Usermanagement;
import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.documents.beans.UploadCompleteMessage;
+import org.apache.openmeetings.persistence.beans.basic.Server;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
import org.apache.openmeetings.persistence.beans.rooms.Rooms;
@@ -196,7 +197,6 @@ public class ScopeApplicationAdapter ext
rcm.getScope(), rcm.getExternalUserId(),
rcm.getExternalUserType(), rcm.getMail(),
rcm.getFirstname(), rcm.getLastname());
-
} catch (Exception err) {
log.error("roomJoin", err);
}
@@ -2992,6 +2992,14 @@ public class ScopeApplicationAdapter ext
* SIP transport methods
*/
+ public synchronized List<Long> getActiveRoomIds() {
+ List<Long> result = new ArrayList<Long>(clientListManager.getActiveRoomIdsByServer(null));
+ for (Server s : serverDao.getActiveServers()) {
+ result.addAll(clientListManager.getActiveRoomIdsByServer(s));
+ }
+ return result;
+ }
+
public synchronized void updateSipTransport() {
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
@@ -3072,8 +3080,7 @@ public class ScopeApplicationAdapter ext
if (conn instanceof IServiceCapableConnection) {
((IServiceCapableConnection) conn).invoke("addNewUser", new Object[]{currentClient}, this);
((IServiceCapableConnection) conn).invoke("newStream", new Object[]{currentClient}, this);
- log.debug("sending setSipTransport to "
- + conn);
+ log.debug("sending setSipTransport to " + conn);
}
}
}