Return-Path: X-Original-To: apmail-incubator-openmeetings-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-openmeetings-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5F2A3EAC1 for ; Thu, 24 Jan 2013 03:07:51 +0000 (UTC) Received: (qmail 60173 invoked by uid 500); 24 Jan 2013 03:07:51 -0000 Delivered-To: apmail-incubator-openmeetings-commits-archive@incubator.apache.org Received: (qmail 59979 invoked by uid 500); 24 Jan 2013 03:07:47 -0000 Mailing-List: contact openmeetings-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: openmeetings-dev@incubator.apache.org Delivered-To: mailing list openmeetings-commits@incubator.apache.org Received: (qmail 59809 invoked by uid 99); 24 Jan 2013 03:07:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Jan 2013 03:07:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Jan 2013 03:07:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1DF4723888CD; Thu, 24 Jan 2013 03:07:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1437846 - /incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java Date: Thu, 24 Jan 2013 03:07:21 -0000 To: openmeetings-commits@incubator.apache.org From: solomax@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130124030721.1DF4723888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: solomax Date: Thu Jan 24 03:07:20 2013 New Revision: 1437846 URL: http://svn.apache.org/viewvc?rev=1437846&view=rev Log: publicSID is updated for both iClient and Client 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=1437846&r1=1437845&r2=1437846&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 Jan 24 03:07:20 2013 @@ -1281,9 +1281,9 @@ public class ScopeApplicationAdapter ext try { IConnection current = Red5.getConnectionLocal(); - String streamid = current.getClient().getId(); - Client currentClient = this.clientListManager - .getClientByStreamId(streamid, null); + IClient c = current.getClient(); + String streamid = c.getId(); + Client currentClient = clientListManager.getClientByStreamId(streamid, null); currentClient.setAvsettings(avsettings); currentClient.setRoom_id(room_id); currentClient.setPublicSID(publicSID); @@ -1291,8 +1291,8 @@ public class ScopeApplicationAdapter ext currentClient.setVHeight(vHeight); currentClient.setInterviewPodId(interviewPodId); // Long room_id = currentClient.getRoom_id(); - this.clientListManager.updateAVClientByStreamId(streamid, - currentClient); + clientListManager.updateAVClientByStreamId(streamid, currentClient); + SessionVariablesUtil.initClient(c, false, publicSID); HashMap hsm = new HashMap(); hsm.put("client", currentClient); @@ -2907,9 +2907,10 @@ public class ScopeApplicationAdapter ext public synchronized void setSipTransport(Long room_id, String publicSID, String broadCastId) { IConnection current = Red5.getConnectionLocal(); - String streamid = current.getClient().getId(); + IClient c = current.getClient(); + String streamid = c.getId(); // Notify all clients of the same scope (room) - Client currentClient = this.clientListManager.getClientByStreamId(streamid, null); + Client currentClient = clientListManager.getClientByStreamId(streamid, null); currentClient.setRoom_id(room_id); currentClient.setRoomEnter(new Date()); currentClient.setFirstname("SIP Transport"); @@ -2921,7 +2922,8 @@ public class ScopeApplicationAdapter ext currentClient.setVWidth(120); currentClient.setVHeight(90); currentClient.setSipTransport(true); - this.clientListManager.updateClientByStreamId(streamid, currentClient, false); + clientListManager.updateClientByStreamId(streamid, currentClient, false); + SessionVariablesUtil.initClient(c, false, publicSID); //TODO not sure if this should be marked as AVClient or not Collection> conCollection = current .getScope().getConnections(); @@ -2937,7 +2939,7 @@ public class ScopeApplicationAdapter ext continue; } - if (!client.getId().equals(current.getClient().getId())) { + if (!client.getId().equals(c.getId())) { // It is not needed to send back // that event to the actual // Moderator