This is an automated email from the git hooks/post-receive script. New commit to branch feature/refonte-ui in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 6ae6aa2383b0d76ce4af130b40603213940ae449 Author: jcouteau <couteau@codelutin.com> Date: Wed May 13 10:03:05 2020 +0200 Fix tests if no questions in poll coming from services (should happen only during tests) --- .../org/chorem/pollen/services/service/PollService.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java index 0b012cb4..fc4114e8 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java @@ -144,13 +144,15 @@ public class PollService extends PollenServiceSupport { Date beginAddChoiceDate = null; Date endAddChoiceDate = null; Boolean addChoiceEnabled = false; - for(QuestionBean question: bean.getQuestions()) { - addChoiceEnabled = addChoiceEnabled || question.isChoiceAddAllowed(); - if (question.getBeginChoiceDate() != null && (beginAddChoiceDate == null || question.getBeginChoiceDate().before(beginAddChoiceDate))) { - beginAddChoiceDate = question.getBeginChoiceDate(); - } - if (question.getEndChoiceDate() != null && (endAddChoiceDate == null || question.getEndChoiceDate().after(endAddChoiceDate))) { - endAddChoiceDate = question.getEndChoiceDate(); + if (bean.getQuestions() != null) { + for (QuestionBean question : bean.getQuestions()) { + addChoiceEnabled = addChoiceEnabled || question.isChoiceAddAllowed(); + if (question.getBeginChoiceDate() != null && (beginAddChoiceDate == null || question.getBeginChoiceDate().before(beginAddChoiceDate))) { + beginAddChoiceDate = question.getBeginChoiceDate(); + } + if (question.getEndChoiceDate() != null && (endAddChoiceDate == null || question.getEndChoiceDate().after(endAddChoiceDate))) { + endAddChoiceDate = question.getEndChoiceDate(); + } } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.