motiejus
/
jgit
1
Fork 0
Code Releases Activity

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:
Matthias Sohn 2018-09-15 02:35:03 +02:00
parent 667ac8b318
commit e6e9073fc7
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
View File

@ -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) { Path p = link.get();
LOG.error(MessageFormat.format(JGitText.get().closeLockTokenFailed, if (!Files.exists(p)) {
this), e); return;
} }
try {
Files.delete(p);
} catch (IOException e) {
LOG.error(MessageFormat
.format(JGitText.get().closeLockTokenFailed, this), e);
} }
} }