Override SimpleStepBuilder.faultTolerant() in FaultTolerantStepBuilder

spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/FaultTolerantStepBuilder.java

@@ -432,6 +432,14 @@ public AbstractTaskletStepBuilder<SimpleStepBuilder<I, O>> stream(ItemStream str
 		}
 		return this;
 	}
+
+	/**
+	 * Override parent method to prevent creation of a new FaultTolerantStepBuilder
+	 */
+	@Override
+	public FaultTolerantStepBuilder<I, O> faultTolerant() {
+		return this;
+	}
 
 	protected ChunkProvider<I> createChunkProvider() {
 

spring-batch-core/src/test/java/org/springframework/batch/core/step/builder/FaultTolerantStepBuilderTests.java

@@ -0,0 +1,15 @@
+package org.springframework.batch.core.step.builder;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+
+public class FaultTolerantStepBuilderTests {
+
+    @Test
+    public void faultTolerantReturnsSameInstance() {
+        FaultTolerantStepBuilder<Object, Object> builder = new FaultTolerantStepBuilder<>(new StepBuilder("test"));
+        assertEquals(builder, builder.faultTolerant());
+    }
+}