motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Call unlockPack in finally"

This commit is contained in:
David Pursehouse 2018-11-14 22:11:26 -05:00 committed by Gerrit Code Review @ Eclipse.org
parent 32a7c9622e ad379793c7
commit c56afbf18c
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
View File

@ -269,20 +269,26 @@ private void service() throws IOException {
} }
} }
if (unpackError == null) { try {
boolean atomic = isCapabilityEnabled(CAPABILITY_ATOMIC); if (unpackError == null) {
setAtomic(atomic); boolean atomic = isCapabilityEnabled(CAPABILITY_ATOMIC);
setAtomic(atomic);
validateCommands(); validateCommands();
if (atomic && anyRejects()) if (atomic && anyRejects()) {
failPendingCommands(); failPendingCommands();
}
preReceive.onPreReceive(this, filterCommands(Result.NOT_ATTEMPTED)); preReceive.onPreReceive(
if (atomic && anyRejects()) this, filterCommands(Result.NOT_ATTEMPTED));
failPendingCommands(); if (atomic && anyRejects()) {
executeCommands(); failPendingCommands();
}
executeCommands();
}
} finally {
unlockPack();
} }
unlockPack();
if (reportStatus) { if (reportStatus) {
if (echoCommandFailures && msgOut != null) { if (echoCommandFailures && msgOut != null) {