commit 3f1ff6d6fc294d798f7b09801753a1ec8e35e1bd
author Luca Milanesio <luca.milanesio@gmail.com> Tue Dec 29 16:48:31 2020 +0000
committer Luca Milanesio <luca.milanesio@gmail.com> Tue Dec 29 16:49:40 2020 +0000
tree 470011bc574249886d141d118f2ba9c4400e6d4a
parent df52b1548cc13351cf4dab493e04bb74ab42ce1e
parent 177a230b082108b25351b54c5485c77622d5bda1

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Ignore change deletion events for owners-autoassign

Change-Id: If7f9457dee71a3c752f279084b3fa3ee258fb99a

owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/GitRefListener.java

diff --git a/owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/GitRefListener.java b/owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/GitRefListener.java
index 4a34958..48f55a5 100644
--- a/owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/GitRefListener.java
+++ b/owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/GitRefListener.java
@@ -84,6 +84,11 @@
 
   @Override
   public void onGitReferenceUpdated(Event event) {
+    if (event.isDelete()) {
+      logger.debug("Ref-update event on ref %s is a deletion: ignoring", event.getRefName());
+      return;
+    }
+
     AccountInfo updaterAccountInfo = event.getUpdater();
     CurrentUser currentUser = currentUserProvider.get();
     if (currentUser.isIdentifiedUser()) {
@@ -137,9 +142,6 @@
     try {
       ChangeApi cApi = changes.id(cId.id);
       ChangeInfo change = cApi.get();
-      if (change == null) {
-        return;
-      }
       PatchList patchList = getPatchList(event, change);
       if (patchList != null) {
         PathOwners owners = new PathOwners(accounts, repository, change.branch, patchList);