branch develop updated (72c9e922 -> 9049d0d2)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 72c9e922 Merge branch 'feature/april' into develop new 9049d0d2 Fix some code quality hickups The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 9049d0d2e7aac0c9e1f00c49079508092b07189d Author: jcouteau <couteau@codelutin.com> Date: Thu Jan 31 12:07:49 2019 +0100 Fix some code quality hickups Summary of changes: .../src/main/java/org/chorem/pollen/services/service/PollService.java | 4 ++-- .../java/org/chorem/pollen/services/service/VoterListService.java | 4 +++- .../java/org/chorem/pollen/services/service/mail/EmailService.java | 3 +++ .../chorem/pollen/votecounting/CumulativeVoteCountingStrategy.java | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 9049d0d2e7aac0c9e1f00c49079508092b07189d Author: jcouteau <couteau@codelutin.com> Date: Thu Jan 31 12:07:49 2019 +0100 Fix some code quality hickups --- .../src/main/java/org/chorem/pollen/services/service/PollService.java | 4 ++-- .../java/org/chorem/pollen/services/service/VoterListService.java | 4 +++- .../java/org/chorem/pollen/services/service/mail/EmailService.java | 3 +++ .../chorem/pollen/votecounting/CumulativeVoteCountingStrategy.java | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) 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 17a81a58..af67afe4 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 @@ -181,7 +181,7 @@ public class PollService extends PollenServiceSupport { bean.setGtuValidated(getGtuService().isGtuValidated(entity)); bean.setMaxVoters(getMaxVoters(entity)); - if (creator.getPollenUser() != null && creator.getPollenUser().getAvatar() != null) { + if (creator!= null && creator.getPollenUser() != null && creator.getPollenUser().getAvatar() != null) { bean.setCreatorAvatar(getPollenResourceService().getReduceIdByTopiaId( creator.getPollenUser().getAvatar().getTopiaId())); } @@ -623,7 +623,7 @@ public class PollService extends PollenServiceSupport { } if (poll.getEndDate() != null) { - check(errors, Poll.PROPERTY_END_DATE, poll.getEndDate().compareTo(beginDate) == 1, l(getLocale(), "pollen.error.poll.endDate.beforeBeginDate")); + check(errors, Poll.PROPERTY_END_DATE, poll.getEndDate().compareTo(beginDate) > 0, l(getLocale(), "pollen.error.poll.endDate.beforeBeginDate")); } if (poll.getCreatorEmail() != null && !poll.getCreatorEmail().isEmpty()) { 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 3c363fb2..32e5b05c 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 @@ -87,7 +87,9 @@ public class VoterListService extends PollenServiceSupport { boolean voting = getVoteDao().forVoterListMemberContains(entity).exists(); bean.setVoting(voting); - bean.setInvalidEmail(pollenPrincipal.isInvalid()); + if (pollenPrincipal != null) { + bean.setInvalidEmail(pollenPrincipal.isInvalid()); + } return bean; } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java index 0934b221..234fd87d 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/EmailService.java @@ -434,6 +434,9 @@ public class EmailService extends PollenServiceSupport { if (log.isErrorEnabled()) { log.error("Error while resending an email, Interrupted sleeping", e); } + + // Restore the interrupted status + Thread.currentThread().interrupt(); } } diff --git a/pollen-votecounting-cumulative/src/main/java/org/chorem/pollen/votecounting/CumulativeVoteCountingStrategy.java b/pollen-votecounting-cumulative/src/main/java/org/chorem/pollen/votecounting/CumulativeVoteCountingStrategy.java index 583629a6..bb177d99 100644 --- a/pollen-votecounting-cumulative/src/main/java/org/chorem/pollen/votecounting/CumulativeVoteCountingStrategy.java +++ b/pollen-votecounting-cumulative/src/main/java/org/chorem/pollen/votecounting/CumulativeVoteCountingStrategy.java @@ -47,7 +47,7 @@ public class CumulativeVoteCountingStrategy extends AbstractVoteCountingStrategy BigDecimal weightSum = BigDecimal.ZERO; for (Voter voter : voters) { - weightSum = weightSum.add(new BigDecimal(voter.getWeight())); + weightSum = weightSum.add(BigDecimal.valueOf(voter.getWeight())); // add this voter votes to result addVoterChoices(voter, scores); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm