cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1450885 - /cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
Date Wed, 27 Feb 2013 17:54:49 GMT
Author: dkulp
Date: Wed Feb 27 17:54:48 2013
New Revision: 1450885

URL: http://svn.apache.org/r1450885
Log:
Merged revisions 1450880 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1450880 | dkulp | 2013-02-27 09:48:01 -0800 (Wed, 27 Feb 2013) | 2 lines

  [CXF-4856] Fix a NPE for java first cases.

........

Modified:
    cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java

Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java?rev=1450885&r1=1450884&r2=1450885&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
Wed Feb 27 17:54:48 2013
@@ -337,7 +337,7 @@ public class EndpointImpl extends javax.
                 if (!endpointInfo.getAddress().contains(addr)) {
                     endpointInfo.setAddress(addr);
                 }
-                if (publishedEndpointUrl != null) {
+                if (publishedEndpointUrl != null && wsdlLocation != null) {
                     endpointInfo.setProperty(WSDLGetUtils.PUBLISHED_ENDPOINT_URL, publishedEndpointUrl);
                     //early update the publishedEndpointUrl so that endpoints in the same
app sharing the same wsdl
                     //do not require all of them to be queried for wsdl before the wsdl is
finally fully updated



Mime
View raw message