This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit efb0aa8c12f6feb79312a5291d164d1ef17b645e Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Aug 20 18:42:02 2014 +0200 fix if poll.beginDate is not set --- .../main/java/org/chorem/pollen/services/service/PollService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 05bd263..8fd85ad 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 @@ -424,8 +424,13 @@ public class PollService extends PollenServiceSupport { checkNotBlank(errors, Poll.PROPERTY_TITLE, poll.getTitle(), l(getLocale(), "pollen.error.poll.title.mandatory")); + Date beginDate = poll.getBeginDate(); + if (beginDate == null) { + beginDate = getNow(); + } + if (poll.getEndDate() != null) { - check(errors, Poll.PROPERTY_END_DATE, poll.getEndDate().compareTo(poll.getBeginDate()) == 1, l(getLocale(), "pollen.error.poll.endDate.beforeBeginDate")); + check(errors, Poll.PROPERTY_END_DATE, poll.getEndDate().compareTo(beginDate) == 1, l(getLocale(), "pollen.error.poll.endDate.beforeBeginDate")); } if (poll.isChoiceAddAllowed()) { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.