From 9e4fd803c6c680097cec2d3339d878b6d656da19 Mon Sep 17 00:00:00 2001
From: Patrick Hiesel <hiesel@google.com>
Date: Tue, 5 Sep 2017 13:12:16 +0200
Subject: [PATCH] Make ChangeControl#isOwner private

Change-Id: Icf837e629f3be7aa48eb63ac653bf1bb55772ab3
---
 .../java/com/google/gerrit/server/project/ChangeControl.java  | 2 +-
 .../google/gerrit/server/project/RemoveReviewerControl.java   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java
index b9649ed021..16444b0a8c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java
@@ -315,7 +315,7 @@ public class ChangeControl {
   }
 
   /** Is this user the owner of the change? */
-  boolean isOwner() {
+  private boolean isOwner() {
     if (getUser().isIdentifiedUser()) {
       Account.Id id = getUser().asIdentifiedUser().getAccountId();
       return id.equals(getChange().getOwner());
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/RemoveReviewerControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/RemoveReviewerControl.java
index 591fcc2f38..b042183c71 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/RemoveReviewerControl.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/RemoveReviewerControl.java
@@ -87,7 +87,9 @@ public class RemoveReviewerControl {
       }
     }
     // 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;
     }
     // Users with the remove reviewer permission, the branch owner, project