From d94c00106884514e98cba7a6e95b26f305efc20f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20K=C3=A4sler?= <tom.kaesler@mni.thm.de>
Date: Sat, 28 Mar 2015 14:52:14 +0100
Subject: [PATCH] When Questions are fetched by SortOrder, it will be checked
if the ID in the SortList really points to a Question
---
src/main/java/de/thm/arsnova/services/QuestionService.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java
index 0b2b62e08..ffd40cbe2 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -944,6 +944,9 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
List<String> questionIds = questionSortOrder.getSortOrder();
for (String t : questionIds) {
Question tempQuestion = getQuestion(t);
+ if (tempQuestion == null) {
+ break;
+ }
if (onlyActive) {
if (tempQuestion.isActive()) {
questions.add(tempQuestion);
--
GitLab