commit 94d88d327b0d617249f4fae7b8fbdc59ad9be5d2
author Dave Borowitz <dborowitz@google.com> Fri May 20 14:04:21 2016 -0400
committer Dave Borowitz <dborowitz@google.com> Fri May 20 14:36:26 2016 -0400
tree c33167a2606ca932847745f3484bd9891dfb7c49
parent 55f6bc6012d3ee167afe4b5ed7c87fd6446253c9

SetAccess: Fix call to GitReferenceUpdated#fire

The Account arg was added a few days ago in I19d27885; merging in the
older changes to SetAccess caused a compilation error in the merge
commit.

Change-Id: Iffebe9ac1ae59513a4bf2d14ecba1489a8e57ef2

gerrit-server/src/main/java/com/google/gerrit/server/project/SetAccess.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetAccess.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/SetAccess.java
index 577ca50..258b386 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetAccess.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/SetAccess.java
@@ -27,14 +27,15 @@
 import com.google.gerrit.extensions.api.access.AccessSectionInfo;
 import com.google.gerrit.extensions.api.access.PermissionInfo;
 import com.google.gerrit.extensions.api.access.PermissionRuleInfo;
-import com.google.gerrit.extensions.api.access.ProjectAccessInput;
 import com.google.gerrit.extensions.api.access.ProjectAccessInfo;
+import com.google.gerrit.extensions.api.access.ProjectAccessInput;
 import com.google.gerrit.extensions.restapi.AuthException;
 import com.google.gerrit.extensions.restapi.BadRequestException;
 import com.google.gerrit.extensions.restapi.ResourceConflictException;
 import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
 import com.google.gerrit.extensions.restapi.RestModifyView;
 import com.google.gerrit.extensions.restapi.UnprocessableEntityException;
+import com.google.gerrit.reviewdb.client.Account;
 import com.google.gerrit.reviewdb.client.Branch;
 import com.google.gerrit.reviewdb.client.Project;
 import com.google.gerrit.reviewdb.client.RefNames;
@@ -297,8 +298,11 @@
       throws IOException {
     RevCommit commit = config.commit(md);
 
+    Account account = user.isIdentifiedUser()
+        ? user.asIdentifiedUser().getAccount()
+        : null;
     gitRefUpdated.fire(config.getProject().getNameKey(), RefNames.REFS_CONFIG,
-        base, commit.getId());
+        base, commit.getId(), account);
 
     projectCache.evict(config.getProject());