summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrudhvi Akhil Alahari <prudhvi@codeaurora.org>2021-05-24 20:40:08 +0530
committerPrudhvi Akhil Alahari <prudhvi@codeaurora.org>2021-05-24 20:50:54 +0530
commit4f04fab5e74c2c09f266072320631339affde1e7 (patch)
tree3a86aaa3908e076cb8d338b0928e0e3395b19341
parent2975ba84e8d516f9ef42d22a31e1ac26d6fa9100 (diff)
EqualsLabelPredicate: Fix bug that prevents matching owner votes
This bug was introduced by I56ff6b1416f0 and it was forgotten to adapt the #match function of the LabelsPredicate. Change-Id: Ia420180eb73fe6aa535ddb8ec39fa981f5f67ddc
-rw-r--r--gerrit-server/src/main/java/com/google/gerrit/server/query/change/EqualsLabelPredicate.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/EqualsLabelPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/EqualsLabelPredicate.java
index 1189e87e21..df3b12a870 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/EqualsLabelPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/EqualsLabelPredicate.java
@@ -125,7 +125,15 @@ class EqualsLabelPredicate extends ChangeIndexPredicate {
return false;
}
- if (account != null && !account.equals(approver)) {
+ if (account != null
+ && !account.equals(approver)
+ && !account.equals(ChangeQueryBuilder.OWNER_ACCOUNT_ID)) {
+ return false;
+ }
+
+ if (account != null
+ && account.equals(ChangeQueryBuilder.OWNER_ACCOUNT_ID)
+ && !change.getOwner().equals(approver)) {
return false;
}