diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/ExitStatus.java b/spring-batch-core/src/main/java/org/springframework/batch/core/ExitStatus.java index 0b0fddbd2..8146a8c55 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/ExitStatus.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/ExitStatus.java @@ -80,7 +80,7 @@ public class ExitStatus implements Serializable, Comparable { public ExitStatus(String exitCode, String exitDescription) { super(); this.exitCode = exitCode; - this.exitDescription = exitDescription; + this.exitDescription = exitDescription == null ? "" : exitDescription; } /** diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/ExitStatusTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/ExitStatusTests.java index fd82afddc..30e9ddc30 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/ExitStatusTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/ExitStatusTests.java @@ -28,6 +28,12 @@ import org.springframework.batch.support.SerializationUtils; */ public class ExitStatusTests { + @Test + public void testExitStatusNullDescription() { + ExitStatus status = new ExitStatus("10", null); + assertEquals("", status.getExitDescription()); + } + @Test public void testExitStatusBooleanInt() { ExitStatus status = new ExitStatus("10");