Fix IOException when LockToken#close fails
This happened if the LockTokens hard link was already deleted earlier. Bug: 531759 Change-Id: Idc84bd695fac1a763b3cbb797c9c4c636a16e329 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
parent
667ac8b318
commit
e6e9073fc7
|
@ -841,13 +841,18 @@ public boolean isCreated() {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void close() {
|
public void close() {
|
||||||
if (link.isPresent()) {
|
if (!link.isPresent()) {
|
||||||
try {
|
return;
|
||||||
Files.delete(link.get());
|
|
||||||
} catch (IOException e) {
|
|
||||||
LOG.error(MessageFormat.format(JGitText.get().closeLockTokenFailed,
|
|
||||||
this), e);
|
|
||||||
}
|
}
|
||||||
|
Path p = link.get();
|
||||||
|
if (!Files.exists(p)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
Files.delete(p);
|
||||||
|
} catch (IOException e) {
|
||||||
|
LOG.error(MessageFormat
|
||||||
|
.format(JGitText.get().closeLockTokenFailed, this), e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue