opendev/gerrit
Code Issues Proposed changes

Fix exception for Revert Submission

Browse Source 
Enclosed changes that had no submission id used to
throw Null pointer exception. This change throws a
meaningful message instead.

Change-Id: I1b3f807d682310216ea3157ebfcbe5e98cdb7a1b
This commit is contained in:
Gal Paikin
2019-11-22 11:23:57 -08:00
parent ccd016c8a4
commit 7e24d0b32b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/com/google/gerrit/server/restapi/change/RevertSubmission.java
View File

@@ -95,11 +95,12 @@ public class RevertSubmission
String.format("change is %s.", ChangeUtil.status(changeResource.getChange()))); String.format("change is %s.", ChangeUtil.status(changeResource.getChange())));
} }
String submissionId = String submissionId = changeResource.getChange().getSubmissionId();
requireNonNull( if (submissionId == null) {
changeResource.getChange().getSubmissionId(), throw new ResourceConflictException(
String.format("merged change %s has no submission ID", changeResource.getId())); "This change is merged but doesn't have a submission id,"
+ " meaning it was not submitted through Gerrit.");
}
List<ChangeData> changeDatas = queryProvider.get().bySubmissionId(submissionId); List<ChangeData> changeDatas = queryProvider.get().bySubmissionId(submissionId);
for (ChangeData changeData : changeDatas) { for (ChangeData changeData : changeDatas) {