commit e37bc113a80cb3620859f5e7facaf7e4277218e8
author Andrew Bonventre <andybons@chromium.org> Tue Nov 08 10:04:12 2016 -0800
committer Andrew Bonventre <andybons@chromium.org> Tue Nov 08 10:32:32 2016 -0800
tree 427b51af38c50afd3264a5676368754a5e191beb
parent ea1f9ea658effefcfa6c406000e15a1a34eef385

Fix comparison on non-compatible types Account.Id and Integer

Change-Id: I920df2b2084644410d117234760444373596a20d

gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java
index 2decd12..e711181 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java
@@ -109,6 +109,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 @Singleton
@@ -248,7 +249,7 @@
         bu.addOp(revision.getChange().getId(), reviewerResult.op);
         if (!ccOrReviewer && reviewerResult.result.reviewers != null) {
           for (ReviewerInfo reviewerInfo : reviewerResult.result.reviewers) {
-            if (id.equals(reviewerInfo._accountId)) {
+            if (Objects.equals(id.get(), reviewerInfo._accountId)) {
               ccOrReviewer = true;
               break;
             }
@@ -256,7 +257,7 @@
         }
         if (!ccOrReviewer && reviewerResult.result.ccs != null) {
           for (AccountInfo accountInfo : reviewerResult.result.ccs) {
-            if (id.equals(accountInfo._accountId)) {
+            if (Objects.equals(id.get(), accountInfo._accountId)) {
               ccOrReviewer = true;
               break;
             }