Author: fdesbois Date: 2012-04-06 18:21:51 +0200 (Fri, 06 Apr 2012) New Revision: 3241 Url: http://chorem.org/repositories/revision/pollen/3241 Log: problem with create, need to check pollUri Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/LoadPoll.java Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/LoadPoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/LoadPoll.java 2012-04-06 15:46:09 UTC (rev 3240) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/LoadPoll.java 2012-04-06 16:21:51 UTC (rev 3241) @@ -61,7 +61,8 @@ prepareFormPage(); UserAccount userAccount = getPollenUserAccount(); - poll = getPollService().getPollEditable(pollUri.getPollId(), userAccount, clone); + String pollUid = pollUri == null ? null : pollUri.getPollId(); + poll = getPollService().getPollEditable(pollUid, userAccount, clone); List<Choice> pollChoices = poll.getChoice(); List<VotingList> pollVotingLists = poll.getVotingList();