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 2013/03/22 14:45:12 UTC
svn commit: r1459770 - in /openmeetings:
branches/2.1/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
Author: solomax
Date: Fri Mar 22 13:45:12 2013
New Revision: 1459770
URL: http://svn.apache.org/r1459770
Log:
SIP: updateSipTransport signature is changed to return current sip users count
Modified:
openmeetings/branches/2.1/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1459770&r1=1459769&r2=1459770&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java Fri Mar 22 13:45:12 2013
@@ -2792,16 +2792,21 @@ public class ScopeApplicationAdapter ext
}
private String getSipTransportLastname(Long roomId) {
- Integer c = roomManager.getSipConferenceMembersNumber(roomId);
+ return getSipTransportLastname(roomId, roomManager.getSipConferenceMembersNumber(roomId));
+ }
+
+ private String getSipTransportLastname(Long roomId, Integer c) {
return (c != null && c > 0) ? "(" + (c - 1) + ")" : "";
}
- public synchronized void updateSipTransport() {
+ public synchronized int updateSipTransport() {
log.debug("----------- updateSipTransport");
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
Client client = sessionManager.getClientByStreamId(streamid, null);
- String newNumber = getSipTransportLastname(client.getRoom_id());
+ Long roomId = client.getRoom_id();
+ Integer count = roomManager.getSipConferenceMembersNumber(roomId);
+ String newNumber = getSipTransportLastname(roomId, count);
log.debug("getSipConferenceMembersNumber: " + newNumber);
if (!newNumber.equals(client.getLastname())) {
client.setLastname(newNumber);
@@ -2810,6 +2815,7 @@ public class ScopeApplicationAdapter ext
client.getRoom_id(), client.getFirstname(), client.getLastname(), client.getAvsettings()});
sendMessageWithClient(new String[]{"personal",client.getFirstname(),client.getLastname()});
}
+ return count != null && count > 0 ? count - 1 : 0;
}
/**
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=1459770&r1=1459769&r2=1459770&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 Fri Mar 22 13:45:12 2013
@@ -2710,16 +2710,21 @@ public class ScopeApplicationAdapter ext
}
private String getSipTransportLastname(Long roomId) {
- Integer c = roomManager.getSipConferenceMembersNumber(roomId);
+ return getSipTransportLastname(roomId, roomManager.getSipConferenceMembersNumber(roomId));
+ }
+
+ private String getSipTransportLastname(Long roomId, Integer c) {
return (c != null && c > 0) ? "(" + (c - 1) + ")" : "";
}
- public synchronized void updateSipTransport() {
+ public synchronized int updateSipTransport() {
log.debug("----------- updateSipTransport");
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
Client client = sessionManager.getClientByStreamId(streamid, null);
- String newNumber = getSipTransportLastname(client.getRoom_id());
+ Long roomId = client.getRoom_id();
+ Integer count = roomManager.getSipConferenceMembersNumber(roomId);
+ String newNumber = getSipTransportLastname(roomId, count);
log.debug("getSipConferenceMembersNumber: " + newNumber);
if (!newNumber.equals(client.getLastname())) {
client.setLastname(newNumber);
@@ -2728,6 +2733,7 @@ public class ScopeApplicationAdapter ext
client.getRoom_id(), client.getFirstname(), client.getLastname(), client.getAvsettings()});
sendMessageWithClient(new String[]{"personal",client.getFirstname(),client.getLastname()});
}
+ return count != null && count > 0 ? count - 1 : 0;
}
/**