Merge branch 'master' into BATCH-1799

2012-11-16 13:19:39 -06:00
parent 4ec551e0ff 22894ada90
commit b9f2ddcb6a
2 changed files with 34 additions and 1 deletions
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplate.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplate.java
@@ -258,7 +258,7 @@ public class TaskExecutorRepeatTemplate extends RepeatTemplate {
 				result = callback.doInIteration(context);

 			}
-			catch (Exception e) {
+			catch (Throwable e) {
 				error = e;
 			}
 			finally {