From 4b6a9f54569b12c282c75ecde2c56e2dda333533 Mon Sep 17 00:00:00 2001
From: Christoph Thelen <christoph.thelen@mni.thm.de>
Date: Thu, 10 Sep 2015 23:32:27 +0200
Subject: [PATCH] Fix deleting of imported sessions
---
src/main/java/de/thm/arsnova/services/SessionService.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/services/SessionService.java b/src/main/java/de/thm/arsnova/services/SessionService.java
index 74940d24a..a2df7abf6 100644
--- a/src/main/java/de/thm/arsnova/services/SessionService.java
+++ b/src/main/java/de/thm/arsnova/services/SessionService.java
@@ -356,11 +356,15 @@ public class SessionService implements ISessionService, ApplicationEventPublishe
for (String subject : prepSubjects) {
SortOrder sortOrder = databaseDao.getSortOrder(session.get_id(), "preparation", subject);
- databaseDao.deleteSortOrder(sortOrder);
+ if (sortOrder != null) {
+ databaseDao.deleteSortOrder(sortOrder);
+ }
}
for (String subject : lectureSubjects) {
SortOrder sortOrder = databaseDao.getSortOrder(session.get_id(), "lecture", subject);
- databaseDao.deleteSortOrder(sortOrder);
+ if (sortOrder != null) {
+ databaseDao.deleteSortOrder(sortOrder);
+ }
}
databaseDao.deleteAllQuestionsWithAnswers(session);
databaseDao.deleteSession(session);
--
GitLab