commit 177a230b082108b25351b54c5485c77622d5bda1
author Luca Milanesio <luca.milanesio@gmail.com> Tue Dec 29 16:38:42 2020 +0000
committer Luca Milanesio <luca.milanesio@gmail.com> Tue Dec 29 16:38:47 2020 +0000
tree 72ab5f7a13b0a5e656994b0ca1123f208888e674
parent 89023020b7f64ff91cdd96c552ecdaf4fb5b6f21
parent e710d9f9d15449aa8d71322cd07414d9e5b5265f

Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: Ibf02ab41b9b7b6a55424f724dd501a131e1b0a42

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 a0a6263..7ddd6a7 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
@@ -87,6 +87,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()) {
@@ -140,9 +145,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);