Browse Source

Unlock DirCache in case of occurring exception

A DirCache was not unlocked if an exception occurred in the
DirCacheCheckout constructor.

Bug: 365449
Change-Id: I231d902d52e3e5e9a7748eedaa63a2bb889ebb13
Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
stable-2.0
Jens Baumgart 13 years ago
parent
commit
0a84ad2d2a
  1. 14
      org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java

14
org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java

@ -160,16 +160,22 @@ public class CheckoutCommand extends GitCommand<Ref> {
.parseCommit(headId); .parseCommit(headId);
RevCommit newCommit = revWalk.parseCommit(branch); RevCommit newCommit = revWalk.parseCommit(branch);
RevTree headTree = headCommit == null ? null : headCommit.getTree(); RevTree headTree = headCommit == null ? null : headCommit.getTree();
DirCacheCheckout dco = new DirCacheCheckout(repo, headTree, DirCacheCheckout dco;
repo.lockDirCache(), newCommit.getTree()); DirCache dc = repo.lockDirCache();
try {
dco = new DirCacheCheckout(repo, headTree, dc,
newCommit.getTree());
dco.setFailOnConflict(true); dco.setFailOnConflict(true);
try { try {
dco.checkout(); dco.checkout();
} catch (org.eclipse.jgit.errors.CheckoutConflictException e) { } catch (org.eclipse.jgit.errors.CheckoutConflictException e) {
status = new CheckoutResult(Status.CONFLICTS, dco status = new CheckoutResult(Status.CONFLICTS,
.getConflicts()); dco.getConflicts());
throw new CheckoutConflictException(dco.getConflicts(), e); throw new CheckoutConflictException(dco.getConflicts(), e);
} }
} finally {
dc.unlock();
}
Ref ref = repo.getRef(name); Ref ref = repo.getRef(name);
if (ref != null && !ref.getName().startsWith(Constants.R_HEADS)) if (ref != null && !ref.getName().startsWith(Constants.R_HEADS))
ref = null; ref = null;

Loading…
Cancel
Save