From e663680b481ab7ad8bd6a60cb608f2413fe4648d Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Fri, 31 Jan 2020 12:46:18 +0100 Subject: [PATCH] openvidu-server: change order of session store and removal from maps --- .../openvidu/server/kurento/core/KurentoSessionManager.java | 2 +- .../recording/service/SingleStreamRecordingService.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java index f8424c6e..fe24680a 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java +++ b/openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoSessionManager.java @@ -524,8 +524,8 @@ public class KurentoSessionManager extends SessionManager { } session = new KurentoSession(sessionNotActive, kms, kurentoSessionEventsHandler, kurentoEndpointConfig); - sessionsNotActive.remove(session.getSessionId()); KurentoSession oldSession = (KurentoSession) sessions.putIfAbsent(session.getSessionId(), session); + sessionsNotActive.remove(session.getSessionId()); if (oldSession != null) { log.warn("Session '{}' has just been created by another thread", session.getSessionId()); return oldSession; diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/service/SingleStreamRecordingService.java b/openvidu-server/src/main/java/io/openvidu/server/recording/service/SingleStreamRecordingService.java index 162fa261..3f9108a6 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/recording/service/SingleStreamRecordingService.java +++ b/openvidu-server/src/main/java/io/openvidu/server/recording/service/SingleStreamRecordingService.java @@ -206,8 +206,8 @@ public class SingleStreamRecordingService extends RecordingService { return finalRecordingArray[0]; } - public void startRecorderEndpointForPublisherEndpoint(Session session, String recordingId, - MediaProfileSpecType profile, Participant participant, CountDownLatch globalStartLatch) { + public void startRecorderEndpointForPublisherEndpoint(final Session session, String recordingId, + MediaProfileSpecType profile, final Participant participant, CountDownLatch globalStartLatch) { log.info("Starting single stream recorder for stream {} in session {}", participant.getPublisherStreamId(), session.getSessionId());