| commit | b738eedcedf9e79248081e6187a3f0b0c0181d88 | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Mon Jul 04 17:02:29 2016 +0900 |
| committer | David Pursehouse <dpursehouse@collab.net> | Mon Jul 04 17:03:37 2016 +0900 |
| tree | 3a03bf5bf361dc7e604376cbe3427ccdd0dfdae3 | |
| parent | 041fce1dc5af2466c9e9a40f6b93407e0aecbf64 [diff] |
ReceiveCommits: Use checkNotNull instead of checkState To prevent false-positive warning from FindBugs about null value. Change-Id: I6c0b48275631ccfd9d7d0c1d16932a19d9613bbe
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java index 66637fb..450c198 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
@@ -1824,7 +1824,7 @@ bySha.put(r.newCommitId, r.notes.getChange()); } Change tipChange = bySha.get(magicBranch.cmd.getNewId()); - checkState(tipChange != null, + checkNotNull(tipChange, "tip of push does not correspond to a change; found these changes: %s", bySha); try (MergeOp op = mergeOpProvider.get()) {