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 166798e310edd545d4df35144347eb71cf604c5f Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Jul 2 14:00:02 2014 +0200 fix nullPointerException in ChoiceBean --- .../chorem/pollen/services/bean/ChoiceBean.java | 27 ++++++++++++---------- .../pollen/services/service/ChoiceService.java | 1 - 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/ChoiceBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/ChoiceBean.java index 215498b..7e40513 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/ChoiceBean.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/ChoiceBean.java @@ -96,23 +96,26 @@ public class ChoiceBean extends PollenBean<Choice> { entity.setTopiaId(getEntityId()); - switch (getChoiceType()) { - case TEXT: - entity.setName(getName()); + ChoiceType choiceType = getChoiceType(); + if (choiceType != null) { + switch (choiceType) { + case TEXT: + entity.setName(getName()); - break; + break; - case DATE: - if (getDate() != null) { - entity.setName(String.valueOf(getDate().getTime())); - } + case DATE: + if ( getDate() != null ) { + entity.setName(String.valueOf(getDate().getTime())); + } - break; + break; - case IMAGE: + case IMAGE: - throw new IllegalStateException("Not implemented"); - //break; + throw new IllegalStateException("Not implemented"); + //break; + } } entity.setDescription(getDescription()); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java index a6c9f2e..1d97812 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java @@ -224,7 +224,6 @@ public class ChoiceService extends PollenServiceSupport { // principal.setEmail(creator.getEmail()); // } - toSave.setChoiceType(choice.getChoiceType()); toSave.setCreator(principal); toSave.setPoll(poll); toSave.setChoiceOrder(choice.getChoiceOrder()); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.