| commit | 7768ed9c95759d3b089fafeeebf6c5a56c6e687d | [log] [tgz] |
|---|---|---|
| author | Zhaohui Feng <rfeng@apache.org> | Thu Nov 15 19:31:00 2012 +0000 |
| committer | Zhaohui Feng <rfeng@apache.org> | Thu Nov 15 19:31:00 2012 +0000 |
| tree | e2971040698f320ef03dda659979b99459cc44e1 | |
| parent | db92899eff097cea357314bb6ac60daedd1aeb87 [diff] |
Fix a regression caused by the base class git-svn-id: https://svn.apache.org/repos/asf/tuscany/sca-java-2.x/trunk@1409943 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SCAParentApplicationContext.java b/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SCAParentApplicationContext.java index 99f58a7..2829891 100644 --- a/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SCAParentApplicationContext.java +++ b/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SCAParentApplicationContext.java
@@ -61,6 +61,11 @@ } // 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); }