This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 80ed9d0 [OPENMEETINGS-2111] empty ice candidate is skipped
80ed9d0 is described below
commit 80ed9d0bec11eab8b67caf313c52a38b6bd2385f
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Fri Sep 13 20:51:16 2019 +0700
[OPENMEETINGS-2111] empty ice candidate is skipped
---
.../apache/openmeetings/core/remote/StreamProcessor.java | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
index fe7f3ff..71f37d9 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
@@ -48,6 +48,7 @@ import
org.apache.openmeetings.db.entity.room.Room.RoomElement;
import org.apache.openmeetings.db.manager.IClientManager;
import org.apache.openmeetings.db.util.ws.RoomMessage;
import org.apache.openmeetings.db.util.ws.TextRoomMessage;
+import org.apache.wicket.util.string.Strings;
import org.kurento.client.IceCandidate;
import org.kurento.client.internal.server.KurentoServerException;
import org.slf4j.Logger;
@@ -103,11 +104,14 @@ public class StreamProcessor implements IStreamProcessor {
sender = getByUid(uid);
if (sender != null) {
JSONObject candidate =
msg.getJSONObject(PARAM_CANDIDATE);
- IceCandidate cand = new IceCandidate(
-
candidate.getString(PARAM_CANDIDATE)
- ,
candidate.getString("sdpMid")
- ,
candidate.getInt("sdpMLineIndex"));
- sender.addCandidate(cand,
msg.getString("luid"));
+ String candStr =
candidate.getString(PARAM_CANDIDATE);
+ if (!Strings.isEmpty(candStr)) {
+ IceCandidate cand = new
IceCandidate(
+ candStr
+ ,
candidate.getString("sdpMid")
+ ,
candidate.getInt("sdpMLineIndex"));
+ sender.addCandidate(cand,
msg.getString("luid"));
+ }
}
break;
case "addListener":
