opendev/gerrit
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Shawn Pearce
2013-11-15 07:20:54 +00:00
committed by Gerrit Code Review
parent 5140786568 f967024c3c
commit c979df57f1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -248,12 +248,14 @@ class IntraLineLoader extends CacheLoader<IntraLineDiffKey, IntraLineDiff> {
// //
if (ab < ae // if (ab < ae //
&& (ab == 0 || a.charAt(ab - 1) == '\n') // && (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++; ae++;
} }
if (bb < be // if (bb < be //
&& (bb == 0 || b.charAt(bb - 1) == '\n') // && (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++; be++;
} }