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

RESOLVED - BATCH-1826: Null pointer exception if optional parameter of

Browse Source 
type DATE is null
This commit is contained in:
Robert Kasanicky
2012-04-06 15:51:29 +02:00
parent 610bfb8687
commit c1f3b9cbc4
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-batch-core/src/main/java/org/springframework/batch/core/converter/DefaultJobParametersConverter.java
View File

@@ -166,6 +166,9 @@ public class DefaultJobParametersConverter implements JobParametersConverter {
String key = entry.getKey();
JobParameter jobParameter = entry.getValue();
Object value = jobParameter.getValue();
if (value == null) {
continue; //skip null parameters
}
if (jobParameter.getType() == ParameterType.DATE) {
result.setProperty(key + DATE_TYPE, dateFormat.format(value));
}

17
spring-batch-core/src/test/java/org/springframework/batch/core/converter/DefaultJobParametersConverterTests.java
View File

@@ -252,4 +252,21 @@ public class DefaultJobParametersConverterTests {
private boolean contains(String str, String searchStr) {
return str.indexOf(searchStr) != -1;
}
@Test
public void testGetPropertiesWithNullValues() throws Exception {
JobParameters parameters = new JobParametersBuilder().addDate("schedule.date", null)
.addString("job.key", null).addLong("vendor.id", null).addDouble("double.key", null)
.toJobParameters();
Properties props = factory.getProperties(parameters);
assertNotNull(props);
final String NOT_FOUND = "NOT FOUND";
assertEquals(NOT_FOUND, props.getProperty("schedule.date", NOT_FOUND));
assertEquals(NOT_FOUND, props.getProperty("job.key", NOT_FOUND));
assertEquals(NOT_FOUND, props.getProperty("vendor.id", NOT_FOUND));
assertEquals(NOT_FOUND, props.getProperty("double.key", NOT_FOUND));
}
}