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/11/30 16:21:36 UTC
svn commit: r1717275 [2/2] - in /openmeetings:
branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/
branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/
trunk/singlewebapp/openmeetings-core/s...
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java?rev=1717275&r1=1717274&r2=1717275&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/WhiteBoardService.java Mon Nov 30 15:21:36 2015
@@ -422,8 +422,7 @@ public class WhiteBoardService implement
IConnection current = Red5.getConnectionLocal();
String streamid = current.getClient().getId();
- Client currentClient = this.sessionManager
- .getClientByStreamId(streamid, null);
+ Client currentClient = sessionManager.getClientByStreamId(streamid, null);
Long room_id = currentClient.getRoomId();
WhiteboardSyncLockObject wSyncLockObject = new WhiteboardSyncLockObject();
@@ -431,20 +430,15 @@ public class WhiteBoardService implement
wSyncLockObject.setPublicSID(currentClient.getPublicSID());
wSyncLockObject.setInserted(new Date());
- Map<String, WhiteboardSyncLockObject> syncListImage = this.whiteBoardObjectListManager
- .getWhiteBoardObjectSyncListByRoomAndObjectId(room_id,
- object_id);
+ Map<String, WhiteboardSyncLockObject> syncListImage = whiteBoardObjectListManager.getWhiteBoardObjectSyncListByRoomAndObjectId(room_id, object_id);
syncListImage.put(currentClient.getPublicSID(), wSyncLockObject);
- this.whiteBoardObjectListManager
- .setWhiteBoardImagesSyncListByRoomAndObjectId(room_id,
- object_id, syncListImage);
+ whiteBoardObjectListManager.setWhiteBoardImagesSyncListByRoomAndObjectId(room_id, object_id, syncListImage);
// Do only send the Token to show the Loading Splash for the
// initial-Request that starts the loading
if (isStarting) {
scopeApplicationAdapter.sendMessageToCurrentScope("sendObjectSyncFlag", wSyncLockObject, true);
}
-
} catch (Exception err) {
log.error("[startNewObjectSyncProcess]", err);
}