svn commit: r1409943 - /tuscany/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SCAParentApplicationContext.java

[rfeng]

Author: rfeng
Date: Thu Nov 15 19:31:00 2012
New Revision: 1409943

URL: http://svn.apache.org/viewvc?rev=1409943&view=rev
Log:
Fix a regression caused by the base class

Modified:
    
tuscany/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SCAParentApplicationContext.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SCAParentApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SCAParentApplicationContext.java?rev=1409943&r1=1409942&r2=1409943&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SCAParentApplicationContext.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/context/SCAParentApplicationContext.java
 Thu Nov 15 19:31:00 2012
@@ -61,6 +61,11 @@ public class SCAParentApplicationContext
     } // 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);
     }