Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BATCH-1995: Updated to handle delimitors at the beginning and end of a line

Browse Source
This commit is contained in:
Michael Minella
2013-04-20 23:34:52 -05:00
parent 7801deeec5
commit 903f5060fb
3 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DelimitedLineTokenizer.java
View File

@@ -144,7 +144,6 @@ public class DelimitedLineTokenizer extends AbstractLineTokenizer {
int fieldCount = 0;
for (int i = 0; i < length; i++) {
char currentChar = chars[i];
boolean isEnd = (i == (length - 1));
@@ -154,7 +153,7 @@ public class DelimitedLineTokenizer extends AbstractLineTokenizer {
int endPosition = (isEnd ? (length - lastCut) : (i - lastCut));
if (isEnd && isDelimiter) {
endPosition--;
endPosition = endPosition - delimiter.length();
}
else if (!isEnd){
endPosition = (endPosition - delimiter.length()) + 1;
@@ -233,7 +232,7 @@ public class DelimitedLineTokenizer extends AbstractLineTokenizer {
private boolean isDelimiter(char[] chars, int i, String token) {
boolean result = false;
if(i >= token.length()) {
if(i >= token.length() - 1) {
String end = new String(chars, (i-token.length()) + 1, token.length());
if(token.equals(end)) {
result = true;