From aa73805a249c522a7a56dece22386479be6e973a Mon Sep 17 00:00:00 2001 From: Michael Minella Date: Mon, 12 Aug 2013 09:21:20 -0500 Subject: [PATCH] BATCH-2062: Updated from code review --- .../core/jsr/step/builder/JsrFaultTolerantStepBuilder.java | 3 +-- .../batch/core/jsr/step/item/JsrChunkProcessor.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/step/builder/JsrFaultTolerantStepBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/step/builder/JsrFaultTolerantStepBuilder.java index 641dee111..7e450d875 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/step/builder/JsrFaultTolerantStepBuilder.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/step/builder/JsrFaultTolerantStepBuilder.java @@ -63,8 +63,7 @@ public class JsrFaultTolerantStepBuilder extends FaultTolerantStepBuilder< @Override @SuppressWarnings({"unchecked", "rawtypes"}) protected ChunkProcessor createChunkProcessor() { - SkipPolicy skipPolicy = createSkipPolicy(); - skipPolicy = getFatalExceptionAwareProxy(skipPolicy); + SkipPolicy skipPolicy = getFatalExceptionAwareProxy(createSkipPolicy()); JsrFaultTolerantChunkProcessor chunkProcessor = new JsrFaultTolerantChunkProcessor(getReader(), getProcessor(), getWriter(), createChunkOperations(), createRetryOperations()); chunkProcessor.setSkipPolicy(skipPolicy); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/step/item/JsrChunkProcessor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/step/item/JsrChunkProcessor.java index 138872ad1..cd93c05b9 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/step/item/JsrChunkProcessor.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/step/item/JsrChunkProcessor.java @@ -101,7 +101,7 @@ public class JsrChunkProcessor implements ChunkProcessor { O processedItem = transform(contribution, item); - if(item != null && processedItem == null) { + if(processedItem == null) { filterCount.incrementAndGet(); } else { output.add(processedItem);