From 24d752a72d4aa220cf8da46102a683d60550814c Mon Sep 17 00:00:00 2001
From: Christoph Thelen <christoph.thelen@mni.thm.de>
Date: Mon, 10 Nov 2014 12:39:20 +0100
Subject: [PATCH] Fixed NullPointerException if question does not exist

---
 src/main/java/de/thm/arsnova/services/QuestionService.java | 4 +++-
 1 file changed, 3 insertions(+), 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 5909cd449..0607ac273 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -270,7 +270,9 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
 	@PreAuthorize("isAuthenticated()")
 	public int getAnswerCount(final String questionId) {
 		final Question question = getQuestion(questionId);
-
+		if (question == null) {
+			return 0;
+		}
 		return databaseDao.getAnswerCount(question, question.getPiRound());
 	}
 
-- 
GitLab