Merge 40ede7f into bc0b4fd

FAForever · Sep 9, 2018 · db9a499 · db9a499
2 parents bc0b4fd + 40ede7f
commit db9a499
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/com/faforever/api/data/domain/VotingChoice.java b/src/main/java/com/faforever/api/data/domain/VotingChoice.java
@@ -82,7 +82,7 @@ public Integer getOrdinal() {
 
   @Transient
   @ComputedAttribute
-  public int getNumberOfAnswers() {
+  public Integer getNumberOfAnswers() {
     return numberOfAnswers;
   }
 

diff --git a/src/main/java/com/faforever/api/data/validation/VotingSubjectRevealWinnerValidator.java b/src/main/java/com/faforever/api/data/validation/VotingSubjectRevealWinnerValidator.java
@@ -15,6 +15,6 @@ public void initialize(VotingSubjectRevealWinnerCheck constraintAnnotation) {
 
   @Override
   public boolean isValid(VotingSubject votingSubject, ConstraintValidatorContext context) {
-    return votingSubject.getRevealWinner() && votingSubject.getEndOfVoteTime().isBefore(OffsetDateTime.now());
+    return votingSubject.getRevealWinner() != Boolean.TRUE || votingSubject.getEndOfVoteTime().isBefore(OffsetDateTime.now());
   }
 }