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 2017/07/24 13:07:18 UTC
openmeetings git commit: [OPENMEETINGS-1673] recording test should be
fixed
Repository: openmeetings
Updated Branches:
refs/heads/master 9504ae3f4 -> 0eaffd3a2
[OPENMEETINGS-1673] recording test should be fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/0eaffd3a
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/0eaffd3a
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/0eaffd3a
Branch: refs/heads/master
Commit: 0eaffd3a24e3a89d16f0c2261bee3efb6daddda2
Parents: 9504ae3
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Jul 24 20:07:10 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Jul 24 20:07:10 2017 +0700
----------------------------------------------------------------------
.../java/org/apache/openmeetings/db/entity/basic/Client.java | 3 +++
.../main/java/org/apache/openmeetings/web/room/RoomPanel.java | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0eaffd3a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
index d103bea..ed5424d 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
@@ -301,6 +301,9 @@ public class Client implements IClient {
}
public void removeStream(String broadcastId) {
+ if (broadcastId == null) {
+ return;
+ }
streams.remove(new Stream(1L, broadcastId, false));
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0eaffd3a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index f64d9f6..ee6c671 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -120,7 +120,7 @@ public class RoomPanel extends BasePanel {
, cp.getRemoteAddress()
, "" + r.getId());
//TODO add all broadcasting clients
- JSONObject options = VideoSettings.getInitJson(cp, "" + r.getId(), getClient().getUid());
+ JSONObject options = VideoSettings.getInitJson(cp, "" + r.getId(), getClient().getSid());
options.put("interview", Room.Type.interview == r.getType());
target.appendJavaScript(String.format("VideoManager.init(%s);", options));
WebSocketHelper.sendRoom(new RoomMessage(r.getId(), getUserId(), RoomMessage.Type.roomEnter));
@@ -435,7 +435,7 @@ public class RoomPanel extends BasePanel {
return;
}
if (getClient().getUid().equals(c.getUid())) {
- c.removeStream(obj.getString("broadcastId"));
+ c.removeStream(obj.optString("broadcastId"));
}
handler.appendJavaScript(String.format("VideoManager.close('%s');", obj.getString("uid")));
}