From cfcaf8c57c4e0a9937ada72b4eaf403e69f0cccc Mon Sep 17 00:00:00 2001
From: robokaso <robokaso@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Fri, 21 Nov 2008 14:37:52 +0000
Subject: [PATCH] fix the hanging build

---
 .../step/item/AbstractFaultTolerantChunkOrientedTasklet.java  | 2 +-
 .../step/item/FaultTolerantChunkOrientedTaskletTests.java     | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/AbstractFaultTolerantChunkOrientedTasklet.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/AbstractFaultTolerantChunkOrientedTasklet.java
index f39eef2ed..ec210bea6 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/AbstractFaultTolerantChunkOrientedTasklet.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/AbstractFaultTolerantChunkOrientedTasklet.java
@@ -234,7 +234,7 @@ public abstract class AbstractFaultTolerantChunkOrientedTasklet<I, O> extends Ab
 			public Object recover(RetryContext context) throws Exception {
 				Exception le = (Exception) context.getLastThrowable();
 				if (!writeSkipPolicy.shouldSkip(le, contribution.getSkipCount())) {
-					throw le;
+					throw new RetryException("Non-skippable exception in recoverer", le);
 				}
 				if (chunk.size() == 1) {
 					O item = chunk.get(0);
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantChunkOrientedTaskletTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantChunkOrientedTaskletTests.java
index 4f6a2d135..a94bfd95a 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantChunkOrientedTaskletTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantChunkOrientedTaskletTests.java
@@ -43,6 +43,7 @@ import org.springframework.batch.item.ParseException;
 import org.springframework.batch.item.UnexpectedInputException;
 import org.springframework.batch.repeat.policy.SimpleCompletionPolicy;
 import org.springframework.batch.repeat.support.RepeatTemplate;
+import org.springframework.batch.retry.RetryException;
 import org.springframework.batch.retry.policy.NeverRetryPolicy;
 import org.springframework.batch.retry.support.RetryTemplate;
 import org.springframework.batch.support.Classifier;
@@ -453,7 +454,8 @@ public class FaultTolerantChunkOrientedTaskletTests {
 			fail();
 		}
 		catch (Exception e) {
-			assertSame(ex, e);
+			assertTrue(e instanceof RetryException);
+			assertSame(ex, e.getCause());
 		}
 
 		/*