[JGIT PATCH] move the 'empty-line' check in RefDatabase#readLine down a bit to after we removed all the whitespaces.

Mark Struberg· Sep 1, 2009, 21:41 UTC · lore

This way we consistently return null regardless if the line is empty or if it does only contain whitespaces.

Signed-off-by: Mark Struberg <struberg@yahoo.de>
---
 .../src/org/spearce/jgit/lib/RefDatabase.java      |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

Show changes to org.spearce.jgit/src/org/spearce/jgit/lib/RefDatabase.java +4 −3

diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/RefDatabase.java b/org.spearce.jgit/src/org/spearce/jgit/lib/RefDatabase.java
index 477dc62..acc835b 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/lib/RefDatabase.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/RefDatabase.java
@@ -498,14 +498,15 @@ private static String readLine(final File file)
             throws FileNotFoundException, IOException {
         final byte[] buf = NB.readFully(file, 4096);
         int n = buf.length;
-        if (n == 0)
-            return null;
         
         // remove trailing whitespaces
         while (n > 0 && Character.isWhitespace(buf[n - 1])) {
             n--;
         }
-        
+
+        if (n == 0)
+            return null;
+
         return RawParseUtils.decode(buf, 0, n);
     }

-- 
1.6.2.5

patchmove the 'empty-line' check in RefDatabase#readLine down a bit to after we removed all the whitespaces.