RESOLVED - issue BATCH-1210: AbstractStep overwrites custom exit status for STOPPED steps

Tweaked exit status handling again in AbstractStep

spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java

@@ -220,6 +220,7 @@ public abstract class AbstractStep implements Step, InitializingBean, BeanNameAw
 
 			try {
 				// Update the step execution to the latest known value so the listeners can act on it
+				exitStatus = exitStatus.and(stepExecution.getExitStatus());
 				stepExecution.setExitStatus(exitStatus);
 				exitStatus = exitStatus.and(getCompositeListener().afterStep(stepExecution));
 			}