From 277246cfb6bfe6c2ed203517ebf35f99ee62f2ee Mon Sep 17 00:00:00 2001 From: dsyer Date: Thu, 22 May 2008 17:01:00 +0000 Subject: [PATCH] IN PROGRESS - issue BATCH-572: Retryable exceptions cannot be skippable Fix exception message (minor) --- .../batch/retry/policy/RecoveryCallbackRetryPolicy.java | 2 +- .../batch/retry/policy/RecoveryRetryPolicyTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/RecoveryCallbackRetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/RecoveryCallbackRetryPolicy.java index 7dc8fdeb1..b5e708553 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/RecoveryCallbackRetryPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/RecoveryCallbackRetryPolicy.java @@ -105,7 +105,7 @@ public class RecoveryCallbackRetryPolicy extends AbstractStatefulRetryPolicy { * type. */ public RetryContext open(RetryCallback callback, RetryContext parent) { - Assert.state(callback instanceof RecoveryRetryCallback, "Callback must be ItemProviderRetryCallback"); + Assert.state(callback instanceof RecoveryRetryCallback, "Callback must be RecoveryRetryCallback"); ItemWriterRetryContext context = new ItemWriterRetryContext((RecoveryRetryCallback) callback, parent); context.open(callback, null); return context; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/RecoveryRetryPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/RecoveryRetryPolicyTests.java index fec5edea6..1b76b54e5 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/RecoveryRetryPolicyTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/RecoveryRetryPolicyTests.java @@ -66,7 +66,7 @@ public class RecoveryRetryPolicyTests extends TestCase { fail("Expected IllegalStateException"); } catch (IllegalStateException e) { - assertTrue(e.getMessage().indexOf("must be ItemProvider") >= 0); + assertTrue(e.getMessage().indexOf("must be RecoveryRetryCallback") >= 0); } }