opendev/gerrit
Code Issues Proposed changes

Merge "Make ChangeControl#isOwner private"

Browse Source
This commit is contained in:
Patrick Hiesel
2017-09-06 10:57:30 +00:00
committed by Gerrit Code Review
parent 87babd400c 9e4fd803c6
commit 886c5c9fa5
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java
View File

@@ -315,7 +315,7 @@ public class ChangeControl {
} }
/** Is this user the owner of the change? */ /** Is this user the owner of the change? */
boolean isOwner() { private boolean isOwner() {
if (getUser().isIdentifiedUser()) { if (getUser().isIdentifiedUser()) {
Account.Id id = getUser().asIdentifiedUser().getAccountId(); Account.Id id = getUser().asIdentifiedUser().getAccountId();
return id.equals(getChange().getOwner()); return id.equals(getChange().getOwner());

4
gerrit-server/src/main/java/com/google/gerrit/server/project/RemoveReviewerControl.java
View File

@@ -87,7 +87,9 @@ public class RemoveReviewerControl {
} }
} }
// The change owner may remove any zero or positive score. // The change owner may remove any zero or positive score.
if (changeControl.isOwner() && 0 <= value) { if (currentUser.isIdentifiedUser()
&& currentUser.getAccountId().equals(notes.getChange().getOwner())
&& 0 <= value) {
return true; return true;
} }
// Users with the remove reviewer permission, the branch owner, project // Users with the remove reviewer permission, the branch owner, project