commit c979df57f135fa9901ae841395bff8c46c70ba71
author Shawn Pearce <sop@google.com> Fri Nov 15 07:20:54 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 15 07:20:54 2013 +0000
tree 80a5bf24d3e940fd1da14783a83e9e2f5b07d0ad
parent 514078656811728f8332bb5764db172d0fd4707c
parent f967024c3c63af871b919441f07161a20092f44a

Merge "Fix inclusion of LF in IntralineLoader" into stable-2.8

gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineLoader.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineLoader.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineLoader.java
index b95994f..52cba09 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineLoader.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineLoader.java
@@ -248,12 +248,14 @@
           //
           if (ab < ae //
               && (ab == 0 || a.charAt(ab - 1) == '\n') //
-              && ae < a.size() && a.charAt(ae) == '\n') {
+              && ae < a.size() && a.charAt(ae - 1) != '\n'
+              && a.charAt(ae) == '\n') {
             ae++;
           }
           if (bb < be //
               && (bb == 0 || b.charAt(bb - 1) == '\n') //
-              && be < b.size() && b.charAt(be) == '\n') {
+              && be < b.size() && b.charAt(be - 1) != '\n'
+              && b.charAt(be) == '\n') {
             be++;
           }