]> source.dussan.org Git - jgit.git/commitdiff
Fix formatting which was broken in 00386272 86/180486/1
authorMatthias Sohn <matthias.sohn@sap.com>
Tue, 11 May 2021 16:36:05 +0000 (18:36 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Tue, 11 May 2021 16:36:05 +0000 (18:36 +0200)
Change-Id: I10a3e2b117e790f64386a8e9e7663db8e59230d9
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java

index f57581a29968bcf39abad72ada8b3a6651748938..78262e977366875b7428bf9df00a659587f4be1f 100644 (file)
@@ -218,14 +218,14 @@ public class LockFile {
                                        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 @@ public class LockFile {
                                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 class LockFile {
                                        }
                                        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) {