From e5c26328bf97f2856ad20d0a6d8fcb0616b83067 Mon Sep 17 00:00:00 2001 From: lucasward Date: Tue, 18 Mar 2008 19:12:36 +0000 Subject: [PATCH] BATCH-483: putting null in an ExecutionContext no longer throws an exception. Also added a unit test. --- .../org/springframework/batch/item/ExecutionContext.java | 4 +++- .../springframework/batch/item/ExecutionContextTests.java | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ExecutionContext.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ExecutionContext.java index 0cc674dc1..e21116278 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ExecutionContext.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ExecutionContext.java @@ -64,7 +64,9 @@ public class ExecutionContext { } public void put(String key, Object value) { - Assert.isInstanceOf(Serializable.class, value, "Value: [ " + value + "must be serializable."); + if(value != null){ + Assert.isInstanceOf(Serializable.class, value, "Value: [ " + value + "must be serializable."); + } dirty = true; map.put(key, value); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ExecutionContextTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ExecutionContextTests.java index 3c0f2ba95..543270981 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ExecutionContextTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ExecutionContextTests.java @@ -95,4 +95,9 @@ public class ExecutionContextTests extends TestCase{ } } + public void testPutNull(){ + //putting null should work + context.put("1", null); + } + }