opendev/gerrit
Code Issues Proposed changes

Merge "Fix possible NPEs in ReplaceRequest.cmd usage in ReceiveCommits"

Browse Source
This commit is contained in:
Shawn O. Pearce
2012-08-09 13:59:08 -07:00
committed by gerrit code review
parent 1a5a1b34d1 a3a1013678
commit 91b17bad38
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
View File

@@ -1406,7 +1406,7 @@ public class ReceiveCommits {
} }
for (ReplaceRequest req : replaceByChange.values()) { for (ReplaceRequest req : replaceByChange.values()) {
if (req.inputCommand.getResult() == NOT_ATTEMPTED) { if (req.inputCommand.getResult() == NOT_ATTEMPTED && req.cmd != null) {
batch.addCommand(req.cmd); batch.addCommand(req.cmd);
} }
} }
@@ -1414,7 +1414,7 @@ public class ReceiveCommits {
if (newChange != null && newChange.getResult() != NOT_ATTEMPTED) { if (newChange != null && newChange.getResult() != NOT_ATTEMPTED) {
// Cancel creations tied to refs/for/ or refs/drafts/ command. // Cancel creations tied to refs/for/ or refs/drafts/ command.
for (ReplaceRequest req : replaceByChange.values()) { for (ReplaceRequest req : replaceByChange.values()) {
if (req.inputCommand == newChange) { if (req.inputCommand == newChange && req.cmd != null) {
req.cmd.setResult(Result.REJECTED_OTHER_REASON, "aborted"); req.cmd.setResult(Result.REJECTED_OTHER_REASON, "aborted");
} }
} }