diff --git a/spring-batch-core/.classpath b/spring-batch-core/.classpath
index cf6e1ec71..6e923d95f 100644
--- a/spring-batch-core/.classpath
+++ b/spring-batch-core/.classpath
@@ -5,21 +5,21 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobConfiguration.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobConfiguration.java
index c0aaf152e..a25c4168e 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobConfiguration.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobConfiguration.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import org.springframework.beans.factory.BeanNameAware;
+import org.springframework.util.ClassUtils;
/**
* Batch domain object representing a job configuration. JobConfiguration is an
@@ -115,4 +116,8 @@ public class JobConfiguration implements BeanNameAware {
public boolean isRestartable() {
return restartable;
}
+
+ public String toString() {
+ return ClassUtils.getShortName(JobConfiguration.class) + ": [name="+name+"]";
+ }
}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/StepExecution.java b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/StepExecution.java
index 9d700cf7e..1868ca120 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/StepExecution.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/StepExecution.java
@@ -191,11 +191,15 @@ public class StepExecution extends Entity {
}
public String toString() {
- return super.toString() + ", taskCount=" + taskCount + ", commitCount=" + commitCount + ", rollbackCount="
+ return super.toString() + ", name=" + getName() + ", taskCount=" + taskCount + ", commitCount=" + commitCount + ", rollbackCount="
+ rollbackCount;
}
+ private String getName() {
+ return step==null ? null : step.getName();
+ }
+
/**
* @param exitStatus
*/
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobExecutionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobExecutionTests.java
index d33021b02..c1ce0111a 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobExecutionTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobExecutionTests.java
@@ -155,5 +155,6 @@ public class JobExecutionTests extends TestCase {
public void testToStringWithNullJob() throws Exception {
context = new JobExecution();
assertTrue("JobExecution string does not contain id", context.toString().indexOf("id=")>=0);
+ assertTrue("JobExecution string does not contain job: "+context, context.toString().indexOf("job=")>=0);
}
}