Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed FlowParser to always include a transition for COMPLETED unless a next attribute is present

Browse Source
This commit is contained in:
Michael Minella
2014-02-06 13:03:45 -06:00
parent b278239751
commit 70875e946a
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/FlowParser.java
View File

@@ -167,10 +167,6 @@ public class FlowParser extends AbstractFlowParser {
stateDef, parserContext, false));
list.addAll(createTransition(FlowExecutionStatus.UNKNOWN, FlowExecutionStatus.UNKNOWN.getName(), null, null,
stateDef, parserContext, false));
if (!hasNextAttribute) {
list.addAll(createTransition(FlowExecutionStatus.COMPLETED, FlowExecutionStatus.COMPLETED.getName(), null, null, stateDef, parserContext,
false));
}
}
if (hasNextAttribute) {
@@ -180,6 +176,9 @@ public class FlowParser extends AbstractFlowParser {
}
list.add(getStateTransitionReference(parserContext, stateDef, null, shortNextAttribute));
} else {
list.addAll(createTransition(FlowExecutionStatus.COMPLETED, FlowExecutionStatus.COMPLETED.getName(), null, null, stateDef, parserContext,
false));
}
return list;

4
spring-batch-core/src/test/java/org/springframework/batch/core/jsr/step/DecisionStepTests.java
View File

@@ -71,14 +71,14 @@ public class DecisionStepTests {
}
@Test
public void testDecisionInvalidExitStatus() throws Exception {
public void testDecisionUnmappedExitStatus() throws Exception {
ApplicationContext context = new GenericXmlApplicationContext("classpath:/org/springframework/batch/core/jsr/step/DecisionStepTests-decisionInvalidExitStatus-context.xml");
JobLauncher launcher = context.getBean(JobLauncher.class);
Job job = context.getBean(Job.class);
JobExecution execution = launcher.run(job, new JobParameters());
assertEquals(BatchStatus.FAILED, execution.getStatus());
assertEquals(BatchStatus.COMPLETED, execution.getStatus());
assertEquals(2, execution.getStepExecutions().size());
for (org.springframework.batch.core.StepExecution curExecution : execution.getStepExecutions()) {