Author: vdegtyarev
Date: Tue Apr 18 04:21:31 2017
New Revision: 1791740
URL: http://svn.apache.org/viewvc?rev=1791740&view=rev
Log:
OPENMEETINGS-551 - The video frame closes for other participants when the
participant with video leaves the room.
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1791740&r1=1791739&r2=1791740&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
Tue Apr 18 04:21:31 2017
@@ -60,6 +60,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.User.Type;
import org.apache.openmeetings.util.InitializationContainer;
import org.apache.openmeetings.util.message.RoomMessage;
+import org.apache.openmeetings.util.message.TextRoomMessage;
import org.apache.openmeetings.web.pages.AccessDeniedPage;
import org.apache.openmeetings.web.pages.ActivatePage;
import org.apache.openmeetings.web.pages.HashPage;
@@ -229,8 +230,10 @@ public class Application extends Authent
public static void exitRoom(Client c) {
Long roomId = c.getRoomId();
- removeUserFromRoom(c);
if (roomId != null) {
+ if (hasVideo(c)){
+ sendRoom(new TextRoomMessage(c.getRoomId(),
c.getUserId(), RoomMessage.Type.closeStream, c.getUid()));
+ }
sendRoom(new RoomMessage(roomId, c.getUserId(),
RoomMessage.Type.roomExit));
getBean(ConferenceLogDao.class).add(
ConferenceLog.Type.roomLeave
@@ -238,6 +241,7 @@ public class Application extends Authent
, c.getRemoteAddress()
, "" + roomId);
}
+ removeUserFromRoom(c);
}
@Override
