From 4891360e4a95c306e567b50ce72f5df3630b0873 Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Fri, 15 Nov 2019 12:18:42 +0100 Subject: [PATCH] MergeSuperSet: Include change ID into error message This makes the investigation of such issues easier. Change-Id: I53557825fe11f2b594ba7b21a0a8c16b310bd183 Signed-off-by: Edwin Kempin --- java/com/google/gerrit/server/submit/MergeSuperSet.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/java/com/google/gerrit/server/submit/MergeSuperSet.java b/java/com/google/gerrit/server/submit/MergeSuperSet.java index c690e0b4e4..bcebc7f27c 100644 --- a/java/com/google/gerrit/server/submit/MergeSuperSet.java +++ b/java/com/google/gerrit/server/submit/MergeSuperSet.java @@ -99,7 +99,11 @@ public class MergeSuperSet { closeOrm = true; } List cds = queryProvider.get().byLegacyChangeId(change.getId()); - checkState(cds.size() == 1, "Expected exactly one ChangeData, got " + cds.size()); + checkState( + cds.size() == 1, + "Expected exactly one ChangeData for change ID %s, got %s", + change.getId(), + cds.size()); ChangeData cd = Iterables.getFirst(cds, null); boolean visible = false;