opendev/gerrit
Code Issues Proposed changes

StarredChangesUtil: Fix NPE when ref to be deleted doesn't exist

Browse Source 
When deleting star refs on a change deletion the star refs are computed
from the index which may be stale. If the ref that we want to delete
doesn't exist that's fine and we can just skip it.

This NPE was observed when a change deletion failed with LOCK_FAILURE
and then the request was automatically retried.

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: Icb73fdfd5bf6141176b733a25809c59e7f4d5c22
This commit is contained in:
Edwin Kempin
2019-08-21 14:13:12 +02:00
parent f297b1e3cb
commit c3769b771b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/com/google/gerrit/server/StarredChangesUtil.java
View File

@@ -254,7 +254,9 @@ public class StarredChangesUtil {
for (Account.Id accountId : byChangeFromIndex(changeId).keySet()) {
String refName = RefNames.refsStarredChanges(changeId, accountId);
Ref ref = repo.getRefDatabase().exactRef(refName);
batchUpdate.addCommand(new ReceiveCommand(ref.getObjectId(), ObjectId.zeroId(), refName));
if (ref != null) {
batchUpdate.addCommand(new ReceiveCommand(ref.getObjectId(), ObjectId.zeroId(), refName));
}
}
batchUpdate.execute(rw, NullProgressMonitor.INSTANCE);
for (ReceiveCommand command : batchUpdate.getCommands()) {