Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BATCH-1034: removed check to avoid potential double post processing - didn't work to well

Browse Source
This commit is contained in:
trisberg
2009-02-13 07:08:03 +00:00
parent f562b01d6e
commit 2e55abc84e
1 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
spring-batch-core/src/main/java/org/springframework/batch/core/scope/StepScope.java
View File

@@ -74,8 +74,6 @@ import org.springframework.util.StringValueResolver;
*/
public class StepScope implements Scope, BeanFactoryPostProcessor, Ordered {
private static Object activePostProcessor = null;
private Log logger = LogFactory.getLog(getClass());
private int order = Ordered.LOWEST_PRECEDENCE;
@@ -181,34 +179,24 @@ public class StepScope implements Scope, BeanFactoryPostProcessor, Ordered {
*/
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
if (activePostProcessor == null) {
activePostProcessor = this;
}
beanFactory.registerScope(name, this);
// Avoid having potential duplicate registrations of this bean run the post process
if (this == activePostProcessor) {
Assert.state(beanFactory instanceof BeanDefinitionRegistry,
"BeanFactory was not a BeanDefinitionRegistry, so StepScope cannot be used.");
BeanDefinitionRegistry registry = (BeanDefinitionRegistry) beanFactory;
beanFactory.registerScope(name, this);
Assert.state(beanFactory instanceof BeanDefinitionRegistry,
"BeanFactory was not a BeanDefinitionRegistry, so StepScope cannot be used.");
BeanDefinitionRegistry registry = (BeanDefinitionRegistry) beanFactory;
Scopifier scopifier = new Scopifier(registry, name, proxyTargetClass);
for (String beanName : beanFactory.getBeanDefinitionNames()) {
BeanDefinition definition = beanFactory.getBeanDefinition(beanName);
// Replace this or any of its inner beans with scoped proxy if it
// has this scope
scopifier.visitBeanDefinition(definition);
if (name.equals(definition.getScope())) {
createScopedProxy(beanName, definition, registry, proxyTargetClass);
}
Scopifier scopifier = new Scopifier(registry, name, proxyTargetClass);
for (String beanName : beanFactory.getBeanDefinitionNames()) {
BeanDefinition definition = beanFactory.getBeanDefinition(beanName);
// Replace this or any of its inner beans with scoped proxy if it
// has this scope
scopifier.visitBeanDefinition(definition);
if (name.equals(definition.getScope())) {
createScopedProxy(beanName, definition, registry, proxyTargetClass);
}
}
}
/**