svn commit: r1157897 - /tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java

[slaws]

Author: slaws
Date: Mon Aug 15 16:00:49 2011
New Revision: 1157897

URL: http://svn.apache.org/viewvc?rev=1157897&view=rev
Log:
TUSCANY-3916 - Check for null interface. I need to find out why a null 
interface is possible but it's causing the build to break so I'll double back 
to this

Modified:
    
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java?rev=1157897&r1=1157896&r2=1157897&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/DefaultSCABindingMapper.java
 Mon Aug 15 16:00:49 2011
@@ -41,6 +41,7 @@ import org.apache.tuscany.sca.contributi
 import 
org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
 import org.apache.tuscany.sca.extensibility.ServiceDeclarationParser;
+import org.apache.tuscany.sca.interfacedef.InterfaceContract;
 import org.apache.tuscany.sca.policy.PolicySubject;
 import org.apache.tuscany.sca.provider.ProviderFactory;
 import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
@@ -263,10 +264,12 @@ public class DefaultSCABindingMapper imp
      * @return
      */
     protected QName chooseBinding(RuntimeEndpoint endpoint) {
-        if(endpoint.getService().getInterfaceContract() != null
-                && 
((RuntimeComponentService)endpoint.getService()).getInterfaceContract().getInterface().isRemotable()
-                && supportsDistributedSCA
-                && isBindingSupported(defaultMappedBinding)) {
+        InterfaceContract interfaceContract = 
endpoint.getService().getInterfaceContract();
+        if(interfaceContract != null
+           && interfaceContract.getInterface() != null
+           && interfaceContract.getInterface().isRemotable()
+           && supportsDistributedSCA
+           && isBindingSupported(defaultMappedBinding)) {
                return defaultMappedBinding;
         }