opendev/gerrit
Code Issues Proposed changes

Merge "Fix java.lang.ArrayIndexOutOfBoundsException when checking for parent" into stable-2.14

Browse Source
This commit is contained in:
David Pursehouse 2017-06-14 13:30:29 +00:00 committed by Gerrit Code Review
commit 70958ea949
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java
View File

@ -225,7 +225,7 @@ public class ChangeKindCacheImpl implements ChangeKindCache {
}
if ((prior.getParentCount() != 1 || next.getParentCount() != 1)
&& (!onlyFirstParentChanged(prior, next) || prior.getParentCount() == 0)) {
&& (prior.getParentCount() == 0 || !onlyFirstParentChanged(prior, next))) {
// Trivial rebases done by machine only work well on 1 parent.
return ChangeKind.REWORK;
}