Author: solomax
Date: Fri Jan 25 08:14:22 2013
New Revision: 1438378
URL: http://svn.apache.org/viewvc?rev=1438378&view=rev
Log:
SIP: sipEnabled flag is taken into account while getting room list.
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=1438378&r1=1438377&r2=1438378&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
Fri Jan 25 08:14:22 2013
@@ -2854,7 +2854,7 @@ public class ScopeApplicationAdapter ext
i.remove();
}
}
- return result;
+ return roomDao.getSipRooms(result);
}
public synchronized List<Long> getActiveRoomIds() {
@@ -2862,7 +2862,7 @@ public class ScopeApplicationAdapter ext
for (Server s : serverDao.getActiveServers()) {
result.addAll(getVerifyedActiveRoomIds(s));
}
- return result;
+ return roomDao.getSipRooms(result);
}
public synchronized void updateSipTransport() {
