summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/branches/2.0-Beta3/modules/core
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-07-21 10:31:50 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-07-21 10:31:50 +0000
commitbefd009cd2be55db418737b3af1a42d3e0cc27cc (patch)
treef1fac41c50041ac08efcc6c452bfe19bbe8eab10 /sca-java-2.x/branches/2.0-Beta3/modules/core
parent1bf9e1ebaa5fe25fc3ef874beebd531b942b963c (diff)
Merge the interface fix in 1149101 to beta3
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1149102 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/branches/2.0-Beta3/modules/core')
-rw-r--r--sca-java-2.x/branches/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java b/sca-java-2.x/branches/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
index b8c205bb28..db12ed14d9 100644
--- a/sca-java-2.x/branches/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
+++ b/sca-java-2.x/branches/2.0-Beta3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
@@ -362,7 +362,14 @@ public class ComponentContextImpl implements RuntimeComponentContext {
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);