From 6974aa72eb761414a45f93f2311f337e5b686456 Mon Sep 17 00:00:00 2001 From: rfeng Date: Thu, 15 Nov 2012 19:31:00 +0000 Subject: Fix a regression caused by the base class git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1409943 13f79535-47bb-0310-9956-ffa450edef68 --- .../implementation/spring/context/SCAParentApplicationContext.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SCAParentApplicationContext.java b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SCAParentApplicationContext.java index 99f58a7933..2829891c52 100644 --- a/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SCAParentApplicationContext.java +++ b/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SCAParentApplicationContext.java @@ -61,6 +61,11 @@ public class SCAParentApplicationContext extends GenericApplicationContext imple } // end constructor + protected BeanFactory getInternalParentBeanFactory() { + // Disable the parent delegation as we'll handle it inside the getBean() + return null; + } + public Object getBean(String name) throws BeansException { return getBean(name, (Class)null); } -- cgit v1.2.3