1 files changed, 11 insertions, 8 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
index 6266920a27..0f37b1adb0 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
+++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/JAXWSBindingInvoker.java
@@ -114,16 +114,19 @@ public class JAXWSBindingInvoker implements Invoker, DataExchangeSemantics {
     protected Dispatch<SOAPMessage> createDispatch(WebServiceBinding wsBinding) {
         URL wsdlLocation = null;
         try {
-            wsdlLocation = new URL(wsBinding.getGeneratedWSDLDocument().getDocumentBaseURI());
+            if (wsBinding.getGeneratedWSDLDocument() != null && wsBinding.getGeneratedWSDLDocument().getDocumentBaseURI() != null) {
+                wsdlLocation = new URL(wsBinding.getGeneratedWSDLDocument().getDocumentBaseURI());
+            }
         } catch (Exception e) {
-            try {
-                if (wsBinding.getUserSpecifiedWSDLDefinition().getLocation() != null) {
-                    wsdlLocation = wsBinding.getUserSpecifiedWSDLDefinition().getLocation().toURL();
-                }
-            } catch (MalformedURLException e1) {
-                // TODO Auto-generated catch block
-                e1.printStackTrace();
+            // ignore and try getting the location from the other places 
+        }
+        try {
+            if (wsBinding.getUserSpecifiedWSDLDefinition().getLocation() != null) {
+                wsdlLocation = wsBinding.getUserSpecifiedWSDLDefinition().getLocation().toURL();
             }
+        } catch (MalformedURLException e1) {
+            // TODO Auto-generated catch block
+            e1.printStackTrace();
         }
 
         QName serviceName = null;