This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit e0244fb97c2d0542058ba08e6da26e3a20351040 Author: Kevin Morin <morin@codelutin.com> Date: Tue May 30 11:57:22 2017 +0200 fix NPE if the choice adding end date is null --- .../src/main/java/org/chorem/pollen/services/bean/PollBean.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollBean.java index 7c79574..1954c40 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollBean.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollBean.java @@ -193,7 +193,8 @@ public class PollBean extends PollenBean<Poll> { if (entity.isChoiceAddAllowed()) { Date beginChoiceDate = entity.getBeginChoiceDate(); Date endChoiceDate = entity.getEndChoiceDate(); - if ((beginChoiceDate == null || now.after(beginChoiceDate)) && now.before(endChoiceDate)) { + if ((beginChoiceDate == null || now.after(beginChoiceDate)) + && (endChoiceDate == null || now.before(endChoiceDate))) { setStatus(PollStatus.ADDING_CHOICES); } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.