commit b406068303bcd25f7bfb72b8360c18af296c323b
author Dave Borowitz <dborowitz@google.com> Wed Aug 24 19:50:03 2016 -0400
committer David Pursehouse <dpursehouse@collab.net> Thu Aug 25 00:25:55 2016 +0000
tree d15dbec515a65e634cc052c6bdb391aa1d294402
parent 64beae58a2ca4cafba1d2e690354a7a8df36d9f0

ApprovalsUtil: Pass correct committerId to canSee

Accidentally passed authorId after checking that committerId is not
null, which can lead to NPE if authorId is null.

Change-Id: I178257cd1bc278e7d56c073c4cc6bcbc35ac294c

gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java
index 5a5d16c..5c0723a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java
@@ -221,7 +221,7 @@
       need.add(authorId);
     }
 
-    if (committerId != null && canSee(db, update.getNotes(), authorId)) {
+    if (committerId != null && canSee(db, update.getNotes(), committerId)) {
       need.add(committerId);
     }
     need.remove(change.getOwner());