commit 6ad93685e0858b8401c1a5fd0bde9b6a821aed1d
author Marco Miller <marco.miller@ericsson.com> Tue Mar 19 16:25:58 2019 -0400
committer Marco Miller <marco.miller@ericsson.com> Tue Mar 19 16:26:01 2019 -0400
tree 15898d23f26bcd3beefe253f04fc70ad32a0b9f8
parent 34029f777866159b4c7e1823b424d54af35e6dc6

AbandonUtil: Keep trying to abandon more changes despite single failure

Before this change, the whole changes abandoning campaign aborted out of
the first failing abandon act encountered.

Change-Id: Ibe7ac031d8a987bf72c20c9c4d585c23b7c6117e

gerrit-server/src/main/java/com/google/gerrit/server/change/AbandonUtil.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/AbandonUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/AbandonUtil.java
index 1dd321f..9ab96f6 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/AbandonUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/AbandonUtil.java
@@ -75,8 +75,12 @@
       ImmutableListMultimap.Builder<Project.NameKey, ChangeControl> builder =
           ImmutableListMultimap.builder();
       for (ChangeData cd : changesToAbandon) {
-        ChangeControl control = cd.changeControl(internalUser);
-        builder.put(control.getProject().getNameKey(), control);
+        try {
+          ChangeControl control = cd.changeControl(internalUser);
+          builder.put(control.getProject().getNameKey(), control);
+        } catch (OrmException e) {
+          log.warn("Failed to query inactive open change for auto-abandoning.", e);
+        }
       }
 
       int count = 0;