From 3906d2b09602b8af37dc59f30d23b15a433998ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20K=C3=A4sler?= <tom.kaesler@mni.thm.de>
Date: Fri, 27 Mar 2015 15:00:27 +0100
Subject: [PATCH] Fix NullEvaluation in saveQuestion
---
src/main/java/de/thm/arsnova/services/QuestionService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java
index d78a36763..924d4d356 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -142,7 +142,7 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
final Question result = databaseDao.saveQuestion(session, question);
SortOrder subjectSortOrder = databaseDao.getSortOrder(session.get_id(), question.getQuestionVariant(), "");
- if (subjectSortOrder != null) {
+ if (subjectSortOrder != null || subjectSortOrder.getSortOrder() != null) {
SortOrder questionSortOrder = databaseDao.getSortOrder(session.get_id(), question.getQuestionVariant(), question.getSubject());
if (questionSortOrder == null) {
List<String> s = new ArrayList<String>();
--
GitLab