Remove unneeded catch block and null checks

The catched exception was just rethrown and the
null check of the locked dir cache was unneeded if
the assignment was done outside the try block.

Change-Id: If2ee1f3eff3849f8da51eab825057fc56e166a94
This commit is contained in:
Kevin Sawicki 2012-05-04 14:37:40 -07:00
parent e5633ba2d3
commit 6f432673c1
1 changed files with 4 additions and 12 deletions

View File

@ -312,35 +312,27 @@ public void apply(DirCacheEntry ent) {
}
private void resetIndex(RevCommit commit) throws IOException {
DirCache dc = null;
DirCache dc = repo.lockDirCache();
try {
dc = repo.lockDirCache();
dc.clear();
DirCacheBuilder dcb = dc.builder();
dcb.addTree(new byte[0], 0, repo.newObjectReader(),
commit.getTree());
dcb.commit();
} catch (IOException e) {
throw e;
} finally {
if (dc != null)
dc.unlock();
dc.unlock();
}
}
private void checkoutIndex(RevCommit commit) throws IOException {
DirCache dc = null;
DirCache dc = repo.lockDirCache();
try {
dc = repo.lockDirCache();
DirCacheCheckout checkout = new DirCacheCheckout(repo, dc,
commit.getTree());
checkout.setFailOnConflict(false);
checkout.checkout();
} catch (IOException e) {
throw e;
} finally {
if (dc != null)
dc.unlock();
dc.unlock();
}
}