You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/02/27 18:56:47 UTC
svn commit: r1450887 -
/cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
Author: dkulp
Date: Wed Feb 27 17:56:46 2013
New Revision: 1450887
URL: http://svn.apache.org/r1450887
Log:
Merged revisions 1450885 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1450885 | dkulp | 2013-02-27 09:54:48 -0800 (Wed, 27 Feb 2013) | 10 lines
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.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java?rev=1450887&r1=1450886&r2=1450887&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java (original)
+++ cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java Wed Feb 27 17:56:46 2013
@@ -336,7 +336,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