opendev/gerrit
Code Issues Proposed changes

LazyPostReceiveHookChain: Catch IllegalStateException on ReceivePack.getPackSize

Browse Source 
The solution in change I0643af77d was incomplete. The pack size can
be uninitialized in cases other than ref deletion. Just try to get
the size and handle the exception, rather than attempt to cover all
the possible cases.

This reverts commit 90305b4b2a.

Bug: Issue 11918
Change-Id: I5b7683664a0ff549cce7c83d5c7a9aa8b351a7cc
This commit is contained in:
David Pursehouse
2019-11-13 14:39:58 -08:00
parent 90305b4b2a
commit 863b805e79
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
java/com/google/gerrit/server/git/receive/LazyPostReceiveHookChain.java
View File

@@ -79,9 +79,20 @@ public class LazyPostReceiveHookChain implements PostReceiveHook {
} }
public static boolean affectsSize(ReceivePack rp, Collection<ReceiveCommand> commands) { public static boolean affectsSize(ReceivePack rp, Collection<ReceiveCommand> commands) {
if (commands.stream().allMatch(c -> c.getType() == ReceiveCommand.Type.DELETE)) { long packSize;
try {
packSize = rp.getPackSize();
} catch (IllegalStateException e) {
// No pack was received, i.e. ref deletion or wind back
return false; return false;
} }
return rp.getPackSize() > 0L; if (packSize > 0L) {
for (ReceiveCommand cmd : commands) {
if (cmd.getType() != ReceiveCommand.Type.DELETE) {
return true;
}
}
}
return false;
} }
} }