ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-server: RPC error response fix

pull/88/merge
pabloFuente 2018-07-09 16:20:27 +02:00
parent b4903eaca0
commit a3849098a3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java
View File

@ -17,7 +17,9 @@
package io.openvidu.server.kurento.core; package io.openvidu.server.kurento.core;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet;
import java.util.Set; import java.util.Set;
import org.kurento.client.IceCandidate; import org.kurento.client.IceCandidate;
@ -287,7 +289,8 @@ public class KurentoSessionManager extends SessionManager {
} catch (OpenViduException e) { } catch (OpenViduException e) {
log.warn("PARTICIPANT {}: Error unpublishing media", participant.getParticipantPublicId(), e); log.warn("PARTICIPANT {}: Error unpublishing media", participant.getParticipantPublicId(), e);
sessionEventsHandler.onUnpublishMedia(participant, null, moderator, transactionId, e, ""); sessionEventsHandler.onUnpublishMedia(participant, new HashSet<>(Arrays.asList(participant)), moderator,
transactionId, e, "");
} }
} }
@ -469,7 +472,8 @@ public class KurentoSessionManager extends SessionManager {
sessionEventsHandler.closeRpcSession(evictedParticipant.getParticipantPrivateId()); sessionEventsHandler.closeRpcSession(evictedParticipant.getParticipantPrivateId());
} else { } else {
if (moderator != null && transactionId != null) { if (moderator != null && transactionId != null) {
this.sessionEventsHandler.onForceDisconnect(moderator, evictedParticipant, null, transactionId, this.sessionEventsHandler.onForceDisconnect(moderator, evictedParticipant,
new HashSet<>(Arrays.asList(moderator)), transactionId,
new OpenViduException(Code.USER_NOT_FOUND_ERROR_CODE, new OpenViduException(Code.USER_NOT_FOUND_ERROR_CODE,
"Connection not found when calling 'forceDisconnect'"), "Connection not found when calling 'forceDisconnect'"),
""); "");
@ -516,7 +520,8 @@ public class KurentoSessionManager extends SessionManager {
} }
@Override @Override
public boolean unpublishStream(Session session, String streamId, Participant moderator, Integer transactionId, String reason) { public boolean unpublishStream(Session session, String streamId, Participant moderator, Integer transactionId,
String reason) {
String participantPrivateId = ((KurentoSession) session).getParticipantPrivateIdFromStreamId(streamId); String participantPrivateId = ((KurentoSession) session).getParticipantPrivateIdFromStreamId(streamId);
if (participantPrivateId != null) { if (participantPrivateId != null) {
Participant participant = this.getParticipant(participantPrivateId); Participant participant = this.getParticipant(participantPrivateId);