From 6e63a74be476cbd5d335761371554d48226f6093 Mon Sep 17 00:00:00 2001 From: Ben Hale Date: Tue, 11 Sep 2007 14:43:10 +0000 Subject: [PATCH] Updated build to use new BeanFactory behavior. --- .../webflow/engine/builder/xml/XmlFlowBuilder.java | 2 +- .../webflow/engine/builder/xml/XmlFlowBuilderNestingTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilder.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilder.java index 3f72c355..abac845a 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilder.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilder.java @@ -102,7 +102,7 @@ import org.xml.sax.SAXException; *

* 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 diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilderNestingTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilderNestingTests.java index 8b0b0ed7..6e79f2b8 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilderNestingTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilderNestingTests.java @@ -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);