From 60340e75b0e23b23a4b5a42966ecf8a612c91da2 Mon Sep 17 00:00:00 2001
From: Robert Kasanicky <robokaso@gmail.com>
Date: Fri, 6 Apr 2012 15:56:17 +0200
Subject: [PATCH] RESOLVED - BATCH-1826: Null pointer exception if optional
 parameter of type DATE is null

---
 .../DefaultJobParametersConverter.java        | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/DefaultJobParametersConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/DefaultJobParametersConverter.java
index 3f1720a38..1b4a73959 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/DefaultJobParametersConverter.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/DefaultJobParametersConverter.java
@@ -166,20 +166,19 @@ 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));
-			}
-			else if (jobParameter.getType() == ParameterType.LONG) {
-				result.setProperty(key + LONG_TYPE, longNumberFormat.format(value));
-			}
-			else if (jobParameter.getType() == ParameterType.DOUBLE) {
-				result.setProperty(key + DOUBLE_TYPE, decimalFormat((Double)value));
-			}
-			else {
-				result.setProperty(key, "" + value);
+			if (value != null) {
+				if (jobParameter.getType() == ParameterType.DATE) {
+					result.setProperty(key + DATE_TYPE, dateFormat.format(value));
+				}
+				else if (jobParameter.getType() == ParameterType.LONG) {
+					result.setProperty(key + LONG_TYPE, longNumberFormat.format(value));
+				}
+				else if (jobParameter.getType() == ParameterType.DOUBLE) {
+					result.setProperty(key + DOUBLE_TYPE, decimalFormat((Double)value));
+				}
+				else {
+					result.setProperty(key, "" + value);
+				}
 			}
 		}
 		return result;