motiejus
/
jgit
1
Fork 0
Code Releases Activity

Remove duplicate calls to DirCache.unlock on checkout 

Calls to unlock the DirCache before throwing an exception
were not needed since checkout calls doCheckout wrapped
in a try block that calls DirCache.unlock in a finally
block.

Change-Id: I2b249a784f9e363430e288aad67fcefb7fac0a6e
Signed-off-by: Kevin Sawicki <kevin@github.com>
This commit is contained in:
Kevin Sawicki 2011-09-13 15:29:55 -07:00
parent cc4e6109e4
commit 4005f3c693
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java
View File

@ -396,10 +396,9 @@ private boolean doCheckout() throws CorruptObjectException, IOException,
prescanOneTree();
if (!conflicts.isEmpty()) {
if (failOnConflict) {
dc.unlock();
if (failOnConflict)
throw new CheckoutConflictException(conflicts.toArray(new String[conflicts.size()]));
} else
else
cleanUpConflicts();
}
@ -448,10 +447,8 @@ private boolean doCheckout() throws CorruptObjectException, IOException,
}
// commit the index builder - a new index is persisted
if (!builder.commit()) {
dc.unlock();
if (!builder.commit())
throw new IndexWriteException();
}
} finally {
objectReader.release();
}