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 c594bd23f28798fd66d166e754712e9e83170ba2 Merge: ec3e92d4 55ff65db Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Jun 1 17:48:52 2018 +0200 Merge tag '3.1.5' into develop correction de la version 3.1.5 # Conflicts: # pollen-persistence/pom.xml # pollen-rest-api/pom.xml # pollen-services/pom.xml # pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java # pollen-ui-riot-js/package.json # pollen-ui-riot-js/pom.xml # pollen-votecounting-aggregator/pom.xml # pollen-votecounting-api/pom.xml # pollen-votecounting-borda/pom.xml # pollen-votecounting-condorcet/pom.xml # pollen-votecounting-coombs/pom.xml # pollen-votecounting-cumulative/pom.xml # pollen-votecounting-instant-runoff/pom.xml # pollen-votecounting-majority-judgment/pom.xml # pollen-votecounting-normal/pom.xml # pollen-votecounting-number/pom.xml # pom.xml .../pollen/services/service/ChoiceService.java | 26 ++++---- .../pollen/services/service/PollService.java | 69 +++++++++++++--------- .../services/service/PollenServiceSupport.java | 8 +++ .../src/main/web/tag/components/LazyLoad.tag.html | 30 ++++++---- 4 files changed, 84 insertions(+), 49 deletions(-) diff --cc pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java index 5dd99413,b701fac7..d3a89399 --- 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 @@@ -127,21 -127,30 +127,27 @@@ public class ChoiceService extends Poll checkNotNull(choice); checkIsNotPersisted(choice); - Poll poll = getPollService().getPoll0(pollId); - checkPermission(PollenPermissions.addChoice(poll)); + // FIXME 01/06/2018 SBavencoff Evite les modifications concurantes en BD du sondage + synchronized (getLock(pollId)) { - List<Choice> existingChoices = getChoiceDao().findAll(poll); + Poll poll = getPollService().getPoll0(pollId); + checkPermission(PollenPermissions.addChoice(poll)); - ErrorMap errorMap = checkChoice(existingChoices, choice); - errorMap.failIfNotEmpty(); + List<Choice> existingChoices = getChoiceDao().findAll(poll); - Choice result = saveChoice(poll, choice); - commit(); + ErrorMap errorMap = checkChoice(existingChoices, choice); + errorMap.failIfNotEmpty(); + - // set the choice order - choice.setChoiceOrder(existingChoices.size()); - + Choice result = saveChoice(poll, choice); + commit(); + + getNotificationService().onChoiceAdded(poll, result); + getFeedService().onChoiceAdded(poll, result); - getNotificationService().onChoiceAdded(poll, result); - getFeedService().onChoiceAdded(poll, result); + return PollenEntityRef.of(result); + + } - return PollenEntityRef.of(result); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.