From ba853eae1e95d4da38e2d6166402e0fa54f44f75 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 16:57:37 +0100
Subject: [PATCH] fix it

---
 .../java/de/thm/arsnova/services/QuestionService.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java
index 1765b3d0c..aaaea9b49 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -917,6 +917,12 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
 				if (subjectSortOrder.getSortOrder().isEmpty()) {
 					databaseDao.deleteSortOrder(subjectSortOrder);
 				}
+				else {
+					databaseDao.createOrUpdateSortOrder(sortOrder);
+				}
+			}
+			else {
+				databaseDao.createOrUpdateSortOrder(sortOrder);
 			}
 		}
 	}
@@ -947,13 +953,13 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
 		for (String sub : subjects) {
 			SortOrder questionSortOrder = databaseDao.getSortOrder(subjectSortOrder.getSessionId(), subjectSortOrder.getQuestionVariant(), sub);
 			if (questionSortOrder == null) {
-				break;
+				continue;
 			}
 			List<String> questionIds = questionSortOrder.getSortOrder();
 			for (String t : questionIds) {
 				Question tempQuestion = getQuestion(t);
 				if (tempQuestion == null) {
-					break;
+					continue;
 				}
 				if (onlyActive) {
 					if (tempQuestion.isActive()) {
-- 
GitLab