diff options
author | Marco Miller <marco.miller@ericsson.com> | 2019-03-19 16:25:58 -0400 |
---|---|---|
committer | Marco Miller <marco.miller@ericsson.com> | 2019-03-19 16:26:01 -0400 |
commit | 6ad93685e0858b8401c1a5fd0bde9b6a821aed1d (patch) | |
tree | 15898d23f26bcd3beefe253f04fc70ad32a0b9f8 | |
parent | 34029f777866159b4c7e1823b424d54af35e6dc6 (diff) |
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
-rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/change/AbandonUtil.java | 8 |
1 files changed, 6 insertions, 2 deletions
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 1dd321f083..9ab96f689c 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 @@ public class AbandonUtil { 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; |