From d2f1ac6abaa47da0dd051f8db7e40f8dda7acdc6 Mon Sep 17 00:00:00 2001 From: bdaniel Date: Tue, 19 Oct 2010 16:15:51 +0000 Subject: TUSCANY-3732 Fix potential NPE in JAXWSServiceBindingProvider git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1024307 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java') diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java index 86f5214b71..91d4bca7c0 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java +++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-jaxws-ri/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/ri/JAXWSServiceBindingProvider.java @@ -112,8 +112,9 @@ public class JAXWSServiceBindingProvider implements ServiceBindingProvider { 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); -- cgit v1.2.3