svn commit: r385877 - /incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAggregateContextImpl.java

[jboynes]

Author: jboynes
Date: Tue Mar 14 12:32:39 2006
New Revision: 385877

URL: http://svn.apache.org/viewcvs?rev=385877&view=rev
Log:
handle AssemblyFacotry references resolved by parent
this should be removed and replace by simple autowire soon

Modified:
    
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAggregateContextImpl.java

Modified: 
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAggregateContextImpl.java
URL: 
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAggregateContextImpl.java?rev=385877&r1=385876&r2=385877&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAggregateContextImpl.java
 (original)
+++ 
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemAggregateContextImpl.java
 Tue Mar 14 12:32:39 2006
@@ -591,7 +591,11 @@
                 return 
instanceInterface.cast(autowireContext.resolveInstance(StAXLoaderRegistry.class));
             }
         } else if 
(instanceInterface.isAssignableFrom(SystemAssemblyFactory.class)) {
-            return instanceInterface.cast(assemblyFactory);
+            if (assemblyFactory != null) {
+                return instanceInterface.cast(assemblyFactory);
+            } else {
+                return 
instanceInterface.cast(autowireContext.resolveInstance(instanceInterface));
+            }
         }
 
         NameToScope mapping = autowireIndex.get(instanceInterface);