| commit | 3fd75a41abbf7b5daed332e593ea19e9e3dce89e | [log] [tgz] |
|---|---|---|
| author | ekempin <ekempin@google.com> | Fri Feb 10 14:30:16 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Feb 10 14:30:16 2017 +0000 |
| tree | 9ecb576d569f59071839f6e16d51e5fa3cf4608b | |
| parent | aaea0d7575d3a02ce89820cd38d351bdf291157b [diff] | |
| parent | 74a9edbd1d6ed49f2c39259207be2b2472f61e71 [diff] |
Merge "Skip empty lines in emails when using TextParser"
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/TextParser.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/TextParser.java index e44f20a..fa33cc6 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/TextParser.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/TextParser.java
@@ -65,6 +65,10 @@ String lastEncounteredFileName = null; Comment lastEncounteredComment = null; for (String line : lines) { + if (line.equals(">")) { + // Skip empty lines + continue; + } if (line.startsWith("> ")) { line = line.substring("> ".length()).trim(); // This is not a comment, try to advance the file/comment pointers and
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/TextParserTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/TextParserTest.java index 5350552..a98835b 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/TextParserTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/TextParserTest.java
@@ -219,6 +219,7 @@ + "> Should entry.getKey() be included in this message?\n" + "> \n" + (c1 == null ? "" : c1 + "\n") + + ">\n" + "> \n" + "> " + changeURL