fixes #33

wumpz · wumpz · commit f3ff104a9cf3 · 2019-09-21T13:59:21.000+02:00
diff --git a/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
@@ -78,7 +78,9 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
                 headerTxt += line + "\n";
             }
         }
-        data.setHeader(headerTxt);
+        if (!"".equals(headerTxt)) {
+            data.setHeader(headerTxt);
+        }
 
         while (line != null) {
             if (!CHUNK.validLine(line)) {
diff --git a/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -126,4 +126,19 @@ public void testParseIssue46() throws IOException {
 
         assertThat(diff.getTail()).isNull();
     }
+
+    @Test
+    public void testParseIssue33() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue33.diff"));
+
+        assertThat(diff.getFiles().size()).isEqualTo(1);
+
+        UnifiedDiffFile file1 = diff.getFiles().get(0);
+        assertThat(file1.getFromFile()).isEqualTo("Main.java");
+        assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
+
+        assertThat(diff.getTail()).isNull();
+        assertThat(diff.getHeader()).isNull();
+    }
 }
diff --git a/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue33.diff b/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue33.diff
@@ -0,0 +1,6 @@
+--- a/Main.java
++++ b/Main.java
+@@ -2,2 +2,3 @@ public class Main {
+     public static void main(String[] args) {
++        System.out.println("Hello, world!");
+     }

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,9 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {`
`78`	`78`	`headerTxt += line + "\n";`
`79`	`79`	`}`
`80`	`80`	`}`
`81`		`- data.setHeader(headerTxt);`
	`81`	`+ if (!"".equals(headerTxt)) {`
	`82`	`+ data.setHeader(headerTxt);`
	`83`	`+ }`
`82`	`84`
`83`	`85`	`while (line != null) {`
`84`	`86`	`if (!CHUNK.validLine(line)) {`