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

RESOLVED - issue BATCH-1326: Restart after <stop/> doesn't work if any previous steps have allowStartIfComplete=true

Browse Source
This commit is contained in:
dsyer
2009-07-08 17:36:05 +00:00
parent f329619099
commit e1c8f35353
4 changed files with 44 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopAndRestartFailedJobParserTests.java
View File

@@ -43,7 +43,7 @@ public class StopAndRestartFailedJobParserTests extends AbstractJobParserTests {
//
// First Launch
//
JobExecution jobExecution = launchAndAssert("[s1]");
JobExecution jobExecution = launchAndAssert("[s0, s1]");
StepExecution stepExecution = getStepExecution(jobExecution, "s1");
assertEquals(BatchStatus.ABANDONED, stepExecution.getStatus());
assertEquals(ExitStatus.FAILED.getExitCode(), stepExecution.getExitStatus().getExitCode());
@@ -52,7 +52,7 @@ public class StopAndRestartFailedJobParserTests extends AbstractJobParserTests {
// Second Launch
//
stepNamesList.clear();
jobExecution = launchAndAssert("[s2]");
jobExecution = launchAndAssert("[s0, s2]");
stepExecution = getStepExecution(jobExecution, "s2");
assertEquals(BatchStatus.COMPLETED, stepExecution.getStatus());
assertEquals(ExitStatus.COMPLETED.getExitCode(), stepExecution.getExitStatus().getExitCode());

22
spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StopAndRestartFailedJobParserTests-context.xml
View File

@@ -1,17 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans:beans xmlns="http://www.springframework.org/schema/batch" xmlns:beans="http://www.springframework.org/schema/beans"
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:p="http://www.springframework.org/schema/p"
xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.0.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
<beans:import resource="common-context.xml" />
<job id="job">
<import resource="common-context.xml" />
<job id="job" xmlns="http://www.springframework.org/schema/batch">
<step id="s0" parent="step0" next="s1"/>
<step id="s1" parent="failingStep">
<stop on="FAILED" restart="s2"/>
<end on="*"/>
<stop on="FAILED" restart="s2" />
<end on="*" />
</step>
<step id="s2" parent="step2"/>
<step id="s2" parent="step2" />
</job>
<bean id="step0" parent="step1" p:allowStartIfComplete="true"/>
</beans:beans>
</beans>