opendev/gerrit
Code Issues Proposed changes

Remove pointless assertion for magicBranch validation

Browse Source 
The code here requires magicBranch.ctl to be defined if
magicBranch.baseCommit was filled in by the caller. Gerrit
is never run with -ea, so the assert is useless.

Remove the check, as the code will just helpfully NPE
when magicBranch.ctl.getRefName() is invoked.

Change-Id: I3cc30a089464ac613cbf69c2c486acf53467b009
This commit is contained in:
Shawn Pearce
2014-12-11 09:14:47 -08:00
parent 729e45f68a
commit 4d48626b92
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1480,7 +1480,6 @@ public class ReceiveCommits {
for (RevCommit c : magicBranch.baseCommit) { for (RevCommit c : magicBranch.baseCommit) {
walk.markUninteresting(c); walk.markUninteresting(c);
} }
assert magicBranch.ctl != null;
Ref targetRef = allRefs.get(magicBranch.ctl.getRefName()); Ref targetRef = allRefs.get(magicBranch.ctl.getRefName());
if (targetRef != null) { if (targetRef != null) {
walk.markUninteresting(walk.parseCommit(targetRef.getObjectId())); walk.markUninteresting(walk.parseCommit(targetRef.getObjectId()));