From 2514f328600cd3d084eb67f14caa864e311765f3 Mon Sep 17 00:00:00 2001 From: dhgarrette Date: Wed, 20 May 2009 23:49:18 +0000 Subject: [PATCH] minor cleanup --- .../configuration/xml/StepParserStepFactoryBean.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java index 22dd069f1..001656288 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java @@ -139,7 +139,6 @@ class StepParserStepFactoryBean implements FactoryBean, BeanNameAware { * @see FactoryBean#getObject() */ public final Object getObject() throws Exception { - AbstractStep step; if (hasChunkElement) { Assert.isNull(tasklet, "Step [" + name + "] has both a element and a 'ref' attribute referencing a Tasklet."); @@ -148,26 +147,24 @@ class StepParserStepFactoryBean implements FactoryBean, BeanNameAware { FaultTolerantStepFactoryBean fb = new FaultTolerantStepFactoryBean(); configureSimple(fb); configureFaultTolerant(fb); - step = (AbstractStep) fb.getObject(); + return fb.getObject(); } else { validateSimpleStep(); SimpleStepFactoryBean fb = new SimpleStepFactoryBean(); configureSimple(fb); - step = (AbstractStep) fb.getObject(); + return fb.getObject(); } } else if (tasklet != null) { TaskletStep ts = new TaskletStep(); configureTaskletStep(ts); - step = (AbstractStep) ts; + return ts; } else { throw new IllegalStateException("Step [" + name + "] has neither a element nor a 'ref' attribute referencing a Tasklet."); } - - return step; } private void configureSimple(SimpleStepFactoryBean fb) {