diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkHandlerFactoryBean.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkHandlerFactoryBean.java index 9def1ae7c3..26ffef4ff8 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkHandlerFactoryBean.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkHandlerFactoryBean.java @@ -122,12 +122,12 @@ public ChunkHandler getObject() throws Exception { stepContributionSource = (StepContributionSource) chunkWriter; } - Assert.state(step instanceof TaskletStep, "Step [" + step.getName() + "] must be a TaskletStep"); + Assert.state(step != null, "A TaskletStep must be provided"); if (logger.isDebugEnabled()) { logger.debug("Converting TaskletStep with name=" + step.getName()); } - Tasklet tasklet = getTasklet(step); + Tasklet tasklet = step.getTasklet(); Assert.state(tasklet instanceof ChunkOrientedTasklet, "Tasklet must be ChunkOrientedTasklet in step=" + step.getName()); @@ -227,15 +227,6 @@ private ChunkProcessor getChunkProcessor(ChunkOrientedTasklet tasklet) { return (ChunkProcessor) getField(tasklet, "chunkProcessor"); } - /** - * Pull a Tasklet out of a step. - * @param step a TaskletStep - * @return the Tasklet - */ - private Tasklet getTasklet(TaskletStep step) { - return (Tasklet) getField(step, "tasklet"); - } - private static Object getField(Object target, String name) { Assert.notNull(target, "Target object must not be null"); Field field = ReflectionUtils.findField(target.getClass(), name);