svn commit: r650862 - /incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java

[an...@apache.org]

Author: antelder
Date: Wed Apr 23 06:31:50 2008
New Revision: 650862

URL: http://svn.apache.org/viewvc?rev=650862&view=rev
Log:
Avoid NPE when interface is null

Modified:
    incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java?rev=650862&r1=650861&r2=650862&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ReferenceBindingProvider.java Wed Apr 23 06:31:50 2008
@@ -61,7 +61,7 @@
         // TODO - fix up the conversational flag and operation sequences in case the contract has come from WSDL
         // as we don't yet support requires="conversational" or sca:endConversation annotations
         // in WSDL interface descriptions (see section 1.5.4 of the Assembly Specification V1.0)
-        if ( reference.getInterfaceContract().getInterface() != null ) {
+        if ( reference.getInterfaceContract().getInterface() != null && contract.getInterface() != null) {
             contract.getInterface().setConversational(reference.getInterfaceContract().getInterface().isConversational());
     
             for (Operation operation : contract.getInterface().getOperations()){
@@ -81,7 +81,9 @@
         }
 
         // Set to use the Axiom data binding
-        contract.getInterface().resetDataBinding(OMElement.class.getName());
+        if (contract.getInterface() != null) {
+            contract.getInterface().resetDataBinding(OMElement.class.getName());
+        }
 
         axisClient = new Axis2ServiceClient(component, reference, wsBinding, servletHost, messageFactory, policyHandlerClassnames);
     }