svn commit: r1178311 - in /tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl: CompositeActivatorImpl.java RuntimeEndpointReferenceImpl.java

[antelder]

Author: antelder
Date: Mon Oct  3 07:17:31 2011
New Revision: 1178311

URL: http://svn.apache.org/viewvc?rev=1178311&view=rev
Log:
TUSCANY-3957: Apply patch from Greg Dritschler to fix Endpoint references are 
not registered in domain registry

Modified:
    
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
    
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java?rev=1178311&r1=1178310&r2=1178311&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
 Mon Oct  3 07:17:31 2011
@@ -630,7 +630,9 @@ public class CompositeActivatorImpl impl
                     epr.isAsyncInvocation()){
                     // it's resolved so start it now
                     try {
-                        start(compositeContext, epr);
+                        // The act of getting invocation chains starts the 
reference in the late binding case
+                        // so just use that here
+                        epr.getInvocationChains();
                     } catch (Throwable ex){
                         Monitor.error(monitor, this, "core-messages", 
"StartException", ex);
                         rethrow(ex);
@@ -650,7 +652,8 @@ public class CompositeActivatorImpl impl
             stop(epr);
         }
     }
-    
+
+    @Deprecated    
     public void start(CompositeContext compositeContext, 
RuntimeEndpointReference endpointReference) {
         
compositeContext.getEndpointRegistry().addEndpointReference(endpointReference);
         

Modified: 
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java?rev=1178311&r1=1178310&r2=1178311&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
 Mon Oct  3 07:17:31 2011
@@ -448,6 +448,10 @@ public class RuntimeEndpointReferenceImp
         }
 
         started = true;
+
+        if (!getReference().getName().startsWith("$self$."))
+            compositeContext.getEndpointRegistry().addEndpointReference(this);
+
         // InterfaceContract bindingContract = getBindingInterfaceContract();
         // endpoint.setInterfaceContract(bindingContract);
     }