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 233ce949bb2d15affa019071f698d70bdb8b4026 Author: Kevin Morin <morin@codelutin.com> Date: Tue May 16 11:16:47 2017 +0200 ref #64 correction de la NPE --- .../src/main/java/org/chorem/pollen/services/bean/PollBean.java | 2 +- 1 file changed, 1 insertion(+), 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 ee3b2a7..07f63c5 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 @@ -191,7 +191,7 @@ public class PollBean extends PollenBean<Poll> { if (entity.isChoiceAddAllowed()) { Date beginChoiceDate = entity.getBeginChoiceDate(); Date endChoiceDate = entity.getEndChoiceDate(); - if (now.after(beginChoiceDate) && now.before(endChoiceDate)) { + if ((beginChoiceDate == null || now.after(beginChoiceDate)) && 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>.