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

REOPENED - BATCH-996: use default retryLimit == 1 (not 0) in *StepFactoryBean

Browse Source 
revert back to default retryLimit == 0 which was actually correct
This commit is contained in:
robokaso
2009-01-29 13:20:20 +00:00
parent c6437b90b1
commit c083ff07b4
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBean.java
View File

@@ -44,7 +44,6 @@ import org.springframework.batch.retry.policy.NeverRetryPolicy;
import org.springframework.batch.retry.policy.RetryContextCache;
import org.springframework.batch.retry.policy.SimpleRetryPolicy;
import org.springframework.batch.support.Classifier;
import org.springframework.util.Assert;
/**
* Factory bean for step that provides options for configuring skip behaviour.
@@ -77,13 +76,13 @@ public class FaultTolerantStepFactoryBean<T, S> extends SimpleStepFactoryBean<T,
fatalExceptionClasses.add(Error.class);
skippableExceptionClasses.add(Exception.class);
// TODO seems to cause trouble, although it shouldn't matter for
// retryLimit=1?
// retryLimit=0?
// retryableExceptionClasses.add(Exception.class);
}
private int cacheCapacity = 0;
private int retryLimit = 1;
private int retryLimit = 0;
private int skipLimit = 0;
@@ -120,7 +119,6 @@ public class FaultTolerantStepFactoryBean<T, S> extends SimpleStepFactoryBean<T,
* @param retryLimit the retry limit to set, must be greater or equal to 1.
*/
public void setRetryLimit(int retryLimit) {
Assert.isTrue(retryLimit >= 1, "retry limit must be greater or equal to 1");
this.retryLimit = retryLimit;
}
@@ -219,7 +217,7 @@ public class FaultTolerantStepFactoryBean<T, S> extends SimpleStepFactoryBean<T,
protected void applyConfiguration(TaskletStep step) {
super.applyConfiguration(step);
if (!(retryLimit > 1 || skipLimit > 0 || retryPolicy != null)) {
if (!(retryLimit > 0 || skipLimit > 0 || retryPolicy != null)) {
// zero fault-tolerance, just use the parent's simple config
return;
}

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/SimpleRetryPolicy.java
View File

@@ -48,7 +48,7 @@ public class SimpleRetryPolicy implements RetryPolicy {
*/
public final static int DEFAULT_MAX_ATTEMPTS = 3;
private volatile int maxAttempts = 1;
private volatile int maxAttempts;
private BinaryExceptionClassifier retryableClassifier = new BinaryExceptionClassifier();