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 f220a079a8ea2fdbfb77d13e0e70dc68cbbc3f78 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jun 5 17:32:34 2014 +0200 fix voter list create and update code --- .../chorem/pollen/services/service/VoterListService.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java index 42f9558..6b0fa84 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java @@ -37,6 +37,7 @@ import org.chorem.pollen.services.bean.PollenEntityRef; import org.chorem.pollen.services.bean.VoterListBean; import org.chorem.pollen.services.bean.VoterListMemberBean; +import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -123,11 +124,7 @@ public class VoterListService extends PollenServiceSupport { List<VoterList> existingVoterLists = getVoterLists0(poll); - VoterList existingVoterList = getVoterList0(pollId, voterList.getEntityId()); - - List<VoterListMember> existingVoterListMembers = getVoterListMembers0(existingVoterList); - - ErrorMap errorMap = checkVoterList(existingVoterLists, voterList, existingVoterListMembers, members); + ErrorMap errorMap = checkVoterList(existingVoterLists, voterList, members); errorMap.failIfNotEmpty(); VoterList result = saveVoterList(poll, voterList); @@ -161,7 +158,7 @@ public class VoterListService extends PollenServiceSupport { List<VoterList> existingVoterLists = getVoterLists0(poll); - ErrorMap errorMap = checkVoterList(existingVoterLists, voterList, null, null); + ErrorMap errorMap = checkVoterList(existingVoterLists, voterList, null); errorMap.failIfNotEmpty(); VoterList result = saveVoterList(poll, voterList); @@ -376,7 +373,7 @@ public class VoterListService extends PollenServiceSupport { } - protected ErrorMap checkVoterList(List<VoterList> existingVoterLists, VoterListBean voterList, List<VoterListMember> existingVoterListMembers, List<VoterListMemberBean> members) { + protected ErrorMap checkVoterList(List<VoterList> existingVoterLists, VoterListBean voterList, List<VoterListMemberBean> members) { ErrorMap errors = new ErrorMap(); @@ -413,6 +410,8 @@ public class VoterListService extends PollenServiceSupport { if (CollectionUtils.isNotEmpty(members)) { + List<VoterListMember> existingVoterListMembers = new ArrayList<>(); + for (VoterListMemberBean voterListMember : members) { ErrorMap voterListMemberErrors = checkVoterListMember(existingVoterListMembers, voterListMember); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.