From ff69d162a92081c978e5e953e5cebd21464d414f Mon Sep 17 00:00:00 2001 From: Christoph Thelen <christoph.thelen@mni.thm.de> Date: Tue, 25 Feb 2014 09:30:52 +0100 Subject: [PATCH] Fixed 500 internal server error if question was not found --- 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 b8f795de..0467de78 100644 --- a/src/main/java/de/thm/arsnova/services/QuestionService.java +++ b/src/main/java/de/thm/arsnova/services/QuestionService.java @@ -112,6 +112,9 @@ public class QuestionService implements IQuestionService { @Authenticated public Question getQuestion(String id) { Question result = databaseDao.getQuestion(id); + if (result == null) { + return null; + } if (!"freetext".equals(result.getQuestionType()) && 0 == result.getPiRound()) { /* needed for legacy questions whose piRound property has not been set */ result.setPiRound(1); -- GitLab