Browse Source

Call unlockPack in finally

The lock is obtained in receivePackAndCheckConnectivity. It seems to me
the structure that requres the caller to unlock the lock is wrong, but
at least by calling in finally ensures it is called even if an exception
is thrown.

Change-Id: I123841b017baf5acffe0064d1004ef11a0a5e6c2
Signed-off-by: Masaya Suzuki <masayasuzuki@google.com>
stable-5.2
Masaya Suzuki 6 years ago
parent
commit
ad379793c7
  1. 28
      org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java

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

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

Loading…
Cancel
Save