Merge "Call unlockPack in finally"

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

@@ -269,20 +269,26 @@ public class ReceivePack extends BaseReceivePack {
 				}
 			}
 
-			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 (echoCommandFailures && msgOut != null) {