From 4f04fab5e74c2c09f266072320631339affde1e7 Mon Sep 17 00:00:00 2001 From: Prudhvi Akhil Alahari Date: Mon, 24 May 2021 20:40:08 +0530 Subject: [PATCH 1/2] 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 --- .../server/query/change/EqualsLabelPredicate.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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; } From 7a8b421f0bc2e78f75b178239f9b001f113a293e Mon Sep 17 00:00:00 2001 From: Prudhvi Akhil Alahari Date: Tue, 25 May 2021 20:59:51 +0530 Subject: [PATCH 2/2] Fix to not throw NPE while accessing draft refs This bug was introduced by I622dbbb334b5a, where notes variable was being accessed without checking for null. Change-Id: I192b0fb8643eb2980998d56e088aa95f16d4b7c2 --- .../java/com/google/gerrit/server/query/change/ChangeData.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeData.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeData.java index 83e2a7ae03..549f88953e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeData.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeData.java @@ -1153,7 +1153,7 @@ public class ChangeData { draftsByUser = new HashMap<>(); if (notesMigration.readChanges()) { - for (Ref ref : commentsUtil.getDraftRefs(notes.getChangeId())) { + for (Ref ref : commentsUtil.getDraftRefs(notes().getChangeId())) { Account.Id account = Account.Id.fromRefSuffix(ref.getName()); if (account != null // Double-check that any drafts exist for this user after