From 0419b2139c8bc1c6ddea82db140fdc02ca9bc3a3 Mon Sep 17 00:00:00 2001 From: dsyer Date: Tue, 2 Dec 2008 18:51:22 +0000 Subject: [PATCH] Add final keyword for mutex --- .../springframework/batch/core/scope/StepScope.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/StepScope.java b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/StepScope.java index 1cb6a36a5..712a55313 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/StepScope.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/StepScope.java @@ -76,7 +76,7 @@ public class StepScope implements Scope, BeanFactoryPostProcessor, Ordered { private int order = Ordered.LOWEST_PRECEDENCE; - private Object mutex = new Object(); + private final Object mutex = new Object(); /** * @param order the order value to set priority of callback execution for @@ -115,11 +115,6 @@ public class StepScope implements Scope, BeanFactoryPostProcessor, Ordered { logger.debug(String.format("Creating object in scope=%s, name=%s", this.name, name)); - /** - * Here is where we need to inject some context (a root - * object for expressions). The ObjectFactory could take a - * parameter? - */ scopedObject = objectFactory.getObject(); context.setAttribute(name, scopedObject); @@ -211,7 +206,7 @@ public class StepScope implements Scope, BeanFactoryPostProcessor, Ordered { public void setName(String name) { this.name = name; } - + /** * Wrap a target bean definition in a proxy that defers initialization until * after the {@link StepContext} is available. Amounts to adding @@ -234,8 +229,8 @@ public class StepScope implements Scope, BeanFactoryPostProcessor, Ordered { // TODO: detect presence of Spring 3.0 and use ScopedPoxyUtils instead // Create the scoped proxy... - BeanDefinitionHolder proxyHolder = PlaceholderProxyFactoryBean.createScopedProxy(new BeanDefinitionHolder(definition, beanName), registry, - proxyTargetClass); + BeanDefinitionHolder proxyHolder = PlaceholderProxyFactoryBean.createScopedProxy(new BeanDefinitionHolder( + definition, beanName), registry, proxyTargetClass); // ...and register it under the original target name registry.registerBeanDefinition(beanName, proxyHolder.getBeanDefinition());