opendev/gerrit
Code Issues Proposed changes

MergeSuperSet: Include change ID into error message

Browse Source 
This makes the investigation of such issues easier.

Change-Id: I53557825fe11f2b594ba7b21a0a8c16b310bd183
Signed-off-by: Edwin Kempin <ekempin@google.com>
(cherry picked from commit 4891360e4a)
This commit is contained in:
Edwin Kempin
2019-11-15 12:18:42 +01:00
committed by David Pursehouse
parent 4b2b9b4036
commit 6f74a43b81
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/com/google/gerrit/server/submit/MergeSuperSet.java
View File

@@ -101,7 +101,11 @@ public class MergeSuperSet {
closeOrm = true;
}
List<ChangeData> 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;