You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/07/09 18:55:29 UTC

svn commit: r554705 - /incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java

Author: rfeng
Date: Mon Jul  9 09:55:28 2007
New Revision: 554705

URL: http://svn.apache.org/viewvc?view=rev&rev=554705
Log:
Use the reference on the component type to create runtime wire

Modified:
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java?view=diff&rev=554705&r1=554704&r2=554705
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java Mon Jul  9 09:55:28 2007
@@ -26,6 +26,7 @@
 import org.apache.tuscany.sca.assembly.ComponentService;
 import org.apache.tuscany.sca.assembly.Composite;
 import org.apache.tuscany.sca.assembly.Implementation;
+import org.apache.tuscany.sca.assembly.Reference;
 import org.apache.tuscany.sca.assembly.SCABinding;
 import org.apache.tuscany.sca.assembly.SCABindingFactory;
 import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
@@ -331,7 +332,10 @@
         InterfaceContract bindingContract = getInterfaceContract(reference, binding);
 
         if (!(binding instanceof SCABinding)) {
-            InterfaceContract sourceContract = reference.getInterfaceContract();
+            // Use the interface contract of the reference on the component type
+            Reference componentTypeRef = reference.getReference();
+            InterfaceContract sourceContract = componentTypeRef == null ? reference.getInterfaceContract()
+                                                                       : componentTypeRef.getInterfaceContract();
 
             // Component Reference --> External Service
             EndpointReference wireSource = new EndpointReferenceImpl((RuntimeComponent)component,



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org