summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2012-11-15 19:31:00 +0000
committerrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2012-11-15 19:31:00 +0000
commit6974aa72eb761414a45f93f2311f337e5b686456 (patch)
treee6dc53e76a18a090f09b8e06f577e4d74f0a9fe1
parenta64693274f60cf0497850b3f2625abe4b23fd0e7 (diff)
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
-rw-r--r--sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SCAParentApplicationContext.java5
1 files changed, 5 insertions, 0 deletions
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);
}