Merge "Remove duplicate calls to DirCache.unlock on checkout"
This commit is contained in:
commit
23bba6fb48
|
@ -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();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue