Author: antelder
Date: Thu Jul 21 08:28:09 2011
New Revision: 1149068
URL: http://svn.apache.org/viewvc?rev=1149068&view=rev
Log:
Merge trunk change r1148761 to add use the correct interface 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 (added)
+++ svn:mergeinfo Thu Jul 21 08:28:09 2011
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules/core:671193
+/tuscany/sca-java-2.x/trunk/modules/core:1148761
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=1149068&r1=1149067&r2=1149068&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 08:28:09 2011
@@ -361,7 +361,7 @@ public class ComponentContextImpl implem
public <B> ServiceReference<B> getServiceReference(Class<B>
businessInterface, RuntimeEndpoint endpoint) {
try {
if (businessInterface == null) {
- InterfaceContract contract =
endpoint.getComponentTypeServiceInterfaceContract();
+ InterfaceContract contract =
endpoint.getBindingInterfaceContract();
businessInterface =
(Class<B>)((JavaInterface)contract.getInterface()).getJavaClass();
}
RuntimeEndpointReference ref =
