commit e60e2b2f398c7b39ed3436611bcced5deaa61e87
author Luca Milanesio <luca.milanesio@gmail.com> Tue Dec 29 16:51:44 2020 +0000
committer Luca Milanesio <luca.milanesio@gmail.com> Tue Dec 29 16:55:00 2020 +0000
tree 4596423055a2ffdebd555f71c8c25245e4fd8d1c
parent bcda01649e6778584705aed420d3bd0517381e9a
parent 3f1ff6d6fc294d798f7b09801753a1ec8e35e1bd

Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  ReviewerManager: Fix build error
  Ignore change deletion events for owners-autoassign

Change-Id: Icc1dbb494c1cb0b4c0905803b885c272712760c5

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 ac101df..81559f7 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.get());
       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);