svn commit: r1149102 - in /tuscany/sca-java-2.x/branches/2.0-Beta3/modules/core: ./ src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java

[antelder]

Author: antelder
Date: Thu Jul 21 10:31:50 2011
New Revision: 1149102

URL: http://svn.apache.org/viewvc?rev=1149102&view=rev
Log:
Merge the interface fix in 1149101 to beta3

Modified:
    tuscany/sca-java-2.x/branches/2.0-Beta3/modules/core/   (props changed)
    
tuscany/sca-java-2.x/branches/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java

Propchange: tuscany/sca-java-2.x/branches/2.0-Beta3/modules/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 10:31:50 2011
@@ -1,2 +1,2 @@
 /tuscany/branches/sca-java-1.3/modules/core:671193
-/tuscany/sca-java-2.x/trunk/modules/core:1148761,1148841
+/tuscany/sca-java-2.x/trunk/modules/core:1148761,1148841,1149101

Modified: 
tuscany/sca-java-2.x/branches/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/branches/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java?rev=1149102&r1=1149101&r2=1149102&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/branches/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
 (original)
+++ 
tuscany/sca-java-2.x/branches/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
 Thu Jul 21 10:31:50 2011
@@ -362,7 +362,14 @@ public class ComponentContextImpl implem
         try {
             if (businessInterface == null) {
                 InterfaceContract contract = 
endpoint.getBindingInterfaceContract();
-                businessInterface = 
(Class<B>)((JavaInterface)contract.getInterface()).getJavaClass();
+                if (contract.getInterface() instanceof JavaInterface) {
+                    businessInterface = 
(Class<B>)((JavaInterface)contract.getInterface()).getJavaClass();
+                } else {
+                    contract = 
endpoint.getComponentTypeServiceInterfaceContract();
+                    if (contract.getInterface() instanceof JavaInterface) {
+                        businessInterface = 
(Class<B>)((JavaInterface)contract.getInterface()).getJavaClass();
+                    }
+                } 
             }
             RuntimeEndpointReference ref =
                 (RuntimeEndpointReference)createEndpointReference(endpoint, 
businessInterface);