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

Updated build to use new BeanFactory behavior.

Browse Source
This commit is contained in:
Ben Hale
2007-09-11 14:43:10 +00:00
parent dd108f5c6e
commit 6e63a74be4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilder.java
View File

@@ -102,7 +102,7 @@ import org.xml.sax.SAXException;
* <p>
* This builder will setup a flow-local bean factory for the flow being constructed. That flow-local bean factory will
* be populated with XML bean definitions contained in files referenced using the "import" element. The flow-local bean
* factory will use the bean factory defing this flow builder as a parent. As such, the flow can access artifacts in
* factory will use the bean factory defining this flow builder as a parent. As such, the flow can access artifacts in
* either its flow-local bean factory or in the parent bean factory hierarchy, e.g. the bean factory of the dispatcher.
*
* @author Erwin Vervaet

2
spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilderNestingTests.java
View File

@@ -75,7 +75,7 @@ public class XmlFlowBuilderNestingTests extends TestCase {
assertSame(testService, action1.getTestService());
assertSame(action1, testFlow2BeanFactory.getBean("action1"));
assertSame(parentBeanFactory, ((HierarchicalBeanFactory) testFlow2BeanFactory).getParentBeanFactory());
assertEquals(2, BeanFactoryUtils.countBeansIncludingAncestors(((ListableBeanFactory) testFlow2BeanFactory)));
assertEquals(4, BeanFactoryUtils.countBeansIncludingAncestors((ListableBeanFactory) testFlow2BeanFactory));
Flow subFlow1 = ((SubflowState) flow.getState("subFlowState1")).getSubflow();
assertNotSame(flow, subFlow1);