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

BATCH-1896

Browse Source
This commit is contained in:
jpraet
2014-03-09 14:24:41 +01:00
committed by Michael Minella
parent a8aa3f907b
commit fec3d57f22
2 changed files with 39 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -541,12 +541,8 @@ public class DefaultFieldSet implements FieldSet {
*/
@Override
public Date readDate(int index, Date defaultValue) {
try {
return readDate(index);
}
catch (IllegalArgumentException e) {
return defaultValue;
}
String candidate = readAndTrim(index);
return StringUtils.hasText(candidate) ? parseDate(candidate, dateFormat) : defaultValue;
}
/*
@@ -575,10 +571,10 @@ public class DefaultFieldSet implements FieldSet {
@Override
public Date readDate(String name, Date defaultValue) {
try {
return readDate(name);
return readDate(indexOf(name), defaultValue);
}
catch (IllegalArgumentException e) {
return defaultValue;
throw new IllegalArgumentException(e.getMessage() + ", name: [" + name + "]");
}
}
@@ -603,12 +599,8 @@ public class DefaultFieldSet implements FieldSet {
*/
@Override
public Date readDate(int index, String pattern, Date defaultValue) {
try {
return readDate(index, pattern);
}
catch (IllegalArgumentException e) {
return defaultValue;
}
String candidate = readAndTrim(index);
return StringUtils.hasText(candidate) ? readDate(index, pattern) : defaultValue;
}
/*
@@ -637,10 +629,10 @@ public class DefaultFieldSet implements FieldSet {
@Override
public Date readDate(String name, String pattern, Date defaultValue) {
try {
return readDate(name, pattern);
return readDate(indexOf(name), pattern, defaultValue);
}
catch (IllegalArgumentException e) {
return defaultValue;
throw new IllegalArgumentException(e.getMessage() + ", name: [" + name + "]");
}
}