opendev/gerrit
Code Issues Proposed changes

PostReview: Remove redundant null-check

Browse Source 
The `current` variable is initialised with the return value from the
scanLabels method, which always returns a Map instance, which may be
empty, but does not return null.

It is therefore not necessary to check for `current` being null in the
initialisation of `allApprovals`.

Removing the null-check prevents FindBugs from warning about potential
null-pointer exceptions on subsequent dereferences of `current` that
are not guarded by null-checks.

Change-Id: If5f2d575a8c44e47e82ec656b494fceb1667a182
This commit is contained in:
David Pursehouse
2016-04-05 19:57:03 +09:00
parent 30938ca111
commit f287d44e84
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java
View File

@@ -567,10 +567,7 @@ public class PostReview implements RestModifyView<RevisionResource, ReviewInput>
Map<String, PatchSetApproval> current = scanLabels(ctx, del); Map<String, PatchSetApproval> current = scanLabels(ctx, del);
// get all approvals in cases of quick approve vote // get all approvals in cases of quick approve vote
Map<String, Short> allApprovals = Collections.emptyMap(); Map<String, Short> allApprovals = approvalsByKey(current.values());
if (current != null) {
allApprovals = approvalsByKey(current.values());
}
allApprovals.putAll(inLabels); allApprovals.putAll(inLabels);
// get previous label votes // get previous label votes