Skip to content
Snippets Groups Projects
Commit a22074d2 authored by srosse's avatar srosse
Browse files

OO-4645: fix join adobe connect red screen if sco missing

parent d42d9b19
No related branches found
No related tags found
No related merge requests found
...@@ -389,24 +389,26 @@ public class AdobeConnectManagerImpl implements AdobeConnectManager, DeletableGr ...@@ -389,24 +389,26 @@ public class AdobeConnectManagerImpl implements AdobeConnectManager, DeletableGr
} }
AdobeConnectSco sco = getAdapter().getScoMeeting(meeting, errors); AdobeConnectSco sco = getAdapter().getScoMeeting(meeting, errors);
String urlPath = sco.getUrlPath(); if(sco != null) {
UriBuilder builder = adobeConnectModule String urlPath = sco.getUrlPath();
.getAdobeConnectHostUriBuilder() UriBuilder builder = adobeConnectModule
.path(urlPath); .getAdobeConnectHostUriBuilder()
.path(urlPath);
BreezeSession session = null;
Authentication authentication = securityManager.findAuthentication(identity, ACONNECT_PROVIDER); BreezeSession session = null;
if(authentication != null) { Authentication authentication = securityManager.findAuthentication(identity, ACONNECT_PROVIDER);
session = getAdapter().commonInfo(authentication, errors); if(authentication != null) {
} session = getAdapter().commonInfo(authentication, errors);
}
if(session != null && StringHelper.containsNonWhitespace(session.getSession())) {
builder.queryParam("session", session.getSession()); if(session != null && StringHelper.containsNonWhitespace(session.getSession())) {
} else { builder.queryParam("session", session.getSession());
String fullName = userManager.getUserDisplayName(identity); } else {
builder.queryParam("guestName", fullName).build(); String fullName = userManager.getUserDisplayName(identity);
builder.queryParam("guestName", fullName).build();
}
return builder.build().toString();
} }
return builder.build().toString();
} }
return null; return null;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment