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 2015/12/06 07:36:50 UTC
svn commit: r1718145 [4/4] - in /openmeetings:
branches/3.1.x/openmeetings-flash/src/main/swf/
branches/3.1.x/openmeetings-flash/src/main/swf/base/
branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/
branches/3.1.x/openmeetings-flash/src/mai...
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java?rev=1718145&r1=1718144&r2=1718145&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java Sun Dec 6 06:36:49 2015
@@ -97,8 +97,9 @@ public class StartSharingEventBehavior e
String baseUrl = cfgDao.getBaseUrl();
URL url = new URL(baseUrl);
Room room = getBean(RoomDao.class).get(roomId);
+ String publicSid = getParam(getComponent(), PARAM_PUBLIC_SID).toString();
SessionManager sessionManager = getBean(SessionManager.class);
- Client rc = sessionManager.getClientByPublicSID(getParam(getComponent(), PARAM_PUBLIC_SID).toString(), null);//TODO not necessary
+ Client rc = sessionManager.getClientByPublicSID(publicSid, null);//TODO not necessary
String path = url.getPath();
path = path.substring(1, path.indexOf('/', 2) + 1);
String port = getParam(getComponent(), PARAM_PORT).toString();
@@ -117,7 +118,7 @@ public class StartSharingEventBehavior e
.replace("$host", url.getHost())
.replace("$app", path + roomId)
.replace("$userId", "" + getUserId())
- .replace("$publicSid", getSid())
+ .replace("$publicSid", publicSid)
.replace("$labels", "<![CDATA[" + getLabels(730, 731, 732, 733, 734
, 735, 737, 738, 739, 740
, 741, 742, 844, 869, 870