From 0ae47e6bbbc50c9f0afc962e487d0f3798f622de Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Sat, 21 Mar 2020 15:30:19 +0100
Subject: [PATCH] OO-4586: reuse the meeting id in single meeting mode
---
.../adobeconnect/manager/AdobeConnectManagerImpl.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/modules/adobeconnect/manager/AdobeConnectManagerImpl.java b/src/main/java/org/olat/modules/adobeconnect/manager/AdobeConnectManagerImpl.java
index e4134919ef5..4cfc00cce6b 100644
--- a/src/main/java/org/olat/modules/adobeconnect/manager/AdobeConnectManagerImpl.java
+++ b/src/main/java/org/olat/modules/adobeconnect/manager/AdobeConnectManagerImpl.java
@@ -274,8 +274,11 @@ public class AdobeConnectManagerImpl implements AdobeConnectManager, DeletableGr
AdobeConnectErrors errors) {
List<AdobeConnectMeeting> currentMeetings = getMeetings(entry, subIdent, businessGroup);
if(currentMeetings != null && !currentMeetings.isEmpty()) {
- AdobeConnectMeeting meeting = currentMeetings.get(0);
- return getAdapter().getScoMeeting(meeting, errors);
+ for (AdobeConnectMeeting meeting:currentMeetings) {
+ if (StringHelper.containsNonWhitespace(meeting.getScoId())) {
+ return getAdapter().getScoMeeting(meeting, errors);
+ }
+ }
}
return null;
}
@@ -285,7 +288,7 @@ public class AdobeConnectManagerImpl implements AdobeConnectManager, DeletableGr
List<AdobeConnectMeeting> currentMeetings = getMeetings(entry, subIdent, businessGroup);
if(currentMeetings != null && !currentMeetings.isEmpty()) {
for(AdobeConnectMeeting meeting:currentMeetings) {
- if(meeting.isPermanent()) {
+ if(meeting.isPermanent() && StringHelper.containsNonWhitespace(meeting.getScoId())) {
return getAdapter().getScoMeeting(meeting, errors);
}
}
--
GitLab