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

Fix Spring3 integration test (default scope is null in Spring 3)

Browse Source
This commit is contained in:
dsyer
2009-11-12 12:51:02 +00:00
parent a36f5163b1
commit 877481bd31
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -365,11 +365,12 @@ public class StepScope implements Scope, BeanFactoryPostProcessor, Ordered {
definition = holder.getBeanDefinition();
}
if (definition != null) {
boolean scopeChange = !scope.equals(definition.getScope());
String otherScope = definition.getScope();
boolean scopeChange = !scope.equals(otherScope);
if (scopeChange) {
new ExpressionHider(definition.getScope(), !scoped).visitBeanDefinition(definition);
new ExpressionHider(otherScope==null?scope:otherScope, !scoped).visitBeanDefinition(definition);
// Exit here so that nested inner bean definitions are not
// analysed by both vistors
// analysed by both visitors
return value;
}
}