You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by bd...@apache.org on 2010/10/19 18:15:51 UTC

svn commit: r1024307 - /tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java

Author: bdaniel
Date: Tue Oct 19 16:15:51 2010
New Revision: 1024307

URL: http://svn.apache.org/viewvc?rev=1024307&view=rev
Log:
TUSCANY-3732 Fix potential NPE in JAXWSServiceBindingProvider

Modified:
    tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java

Modified: tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java?rev=1024307&r1=1024306&r2=1024307&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java Tue Oct 19 16:15:51 2010
@@ -112,8 +112,9 @@ public class JAXWSServiceBindingProvider
                                     wsBinding.getPort().getName());
         properties.put(Endpoint.WSDL_PORT, portName);
                       
+        QName bindingServiceName = wsBinding.getServiceName() == null ? wsBinding.getService().getQName() : wsBinding.getServiceName();
         QName serviceName = new QName(targetNamespace,
-                                      wsBinding.getServiceName().getLocalPart()); 
+                                     bindingServiceName.getLocalPart()); 
         properties.put(Endpoint.WSDL_SERVICE, serviceName);
 
         wsEndpoint.setMetadata(metadata);