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 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;