Merge branch 'stable-5.10' into stable-5.11
* stable-5.10:
Remove texts which were added by mistake in 00386272
Fix formatting which was broken in 00386272
Change-Id: I0f1511be5375716d41565e72b271cb956c3e847b
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java
index f57581a..78262e9 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java
@@ -218,14 +218,14 @@
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 @@
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 @@
}
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) {
