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

no-jira: fix double delete red screen in BigBlueButton admin.

parent ac8e48b4
No related branches found
No related tags found
No related merge requests found
...@@ -327,9 +327,11 @@ public class BigBlueButtonManagerImpl implements BigBlueButtonManager, Initializ ...@@ -327,9 +327,11 @@ public class BigBlueButtonManagerImpl implements BigBlueButtonManager, Initializ
@Override @Override
public boolean deleteMeeting(BigBlueButtonMeeting meeting, BigBlueButtonErrors errors) { public boolean deleteMeeting(BigBlueButtonMeeting meeting, BigBlueButtonErrors errors) {
BigBlueButtonMeeting reloadedMeeting = bigBlueButtonMeetingDao.loadByKey(meeting.getKey()); BigBlueButtonMeeting reloadedMeeting = bigBlueButtonMeetingDao.loadByKey(meeting.getKey());
removeCalendarEvent(reloadedMeeting); if(reloadedMeeting != null) {
deleteRecordings(meeting, errors); removeCalendarEvent(reloadedMeeting);
bigBlueButtonMeetingDao.deleteMeeting(reloadedMeeting); deleteRecordings(meeting, errors);
bigBlueButtonMeetingDao.deleteMeeting(reloadedMeeting);
}
return false; return false;
} }
...@@ -340,7 +342,7 @@ public class BigBlueButtonManagerImpl implements BigBlueButtonManager, Initializ ...@@ -340,7 +342,7 @@ public class BigBlueButtonManagerImpl implements BigBlueButtonManager, Initializ
.collect(Collectors.toList()); .collect(Collectors.toList());
if(availableServers.isEmpty()) { if(availableServers.isEmpty()) {
return null; return null;
} else if(availableServers.size() == 1) {//TODO } else if(availableServers.size() == 1) {
return availableServers.get(0); return availableServers.get(0);
} }
return getBigBlueButtonServer(servers); return getBigBlueButtonServer(servers);
......
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