motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge branch 'stable-5.9' into stable-5.10 

* stable-5.9:
  Remove texts which were added by mistake in 00386272
  Fix formatting which was broken in 00386272

Change-Id: Ifa135077d8d07d2317df3b479822e30d87eca950
This commit is contained in:
Matthias Sohn 2021-05-12 08:55:17 +02:00
parent c557eea782 73f8acdc5c
commit 3d156790e9
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java
View File

@ -218,14 +218,14 @@ public void copyCurrentContent() throws IOException {
int r;
while ((r = fis.read(buf)) >= 0) {
out.write(buf, 0, r);
}
}
}
} catch (FileNotFoundException fnfe) {
if (ref.exists()) {
throw fnfe;
}
// Don't worry about a file that doesn't exist yet, it
// conceptually has no current content to copy.
} catch (FileNotFoundException fnfe) {
if (ref.exists()) {
throw fnfe;
}
// Don't worry about a file that doesn't exist yet, it
// conceptually has no current content to copy.
}
} catch (IOException | RuntimeException | Error ioe) {
unlock();
@ -322,17 +322,16 @@ private OutputStream get() throws IOException {
if (out == null) {
os = getStream();
if (fsync) {
out = Channels.newOutputStream(os.getChannel());
out = Channels.newOutputStream(os.getChannel());
} else {
out = os;
out = os;
}
}
return out;
}
@Override
public void write(byte[] b, int o, int n)
throws IOException {
public void write(byte[] b, int o, int n) throws IOException {
get().write(b, o, n);
}
@ -359,10 +358,10 @@ public void close() throws IOException {
}
if (out != null) {
if (fsync) {
os.getChannel().force(true);
os.getChannel().force(true);
}
out.close();
os = null;
out.close();
os = null;
}
written = true;
} catch (IOException | RuntimeException | Error ioe) {