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/09/09 20:35:51 UTC
svn commit: r1521233 -
/cxf/branches/2.6.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
Author: dkulp
Date: Mon Sep 9 18:35:51 2013
New Revision: 1521233
URL: http://svn.apache.org/r1521233
Log:
Merged revisions 1521230 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1521230 | dkulp | 2013-09-09 14:31:05 -0400 (Mon, 09 Sep 2013) | 10 lines
Merged revisions 1521226 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1521226 | dkulp | 2013-09-09 14:24:26 -0400 (Mon, 09 Sep 2013) | 2 lines
[CXF-4999] Make sure the endpoint property is set even if wsdlLocation is null
........
........
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=1521233&r1=1521232&r2=1521233&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 Mon Sep 9 18:35:51 2013
@@ -336,8 +336,10 @@ public class EndpointImpl extends javax.
if (!endpointInfo.getAddress().contains(addr)) {
endpointInfo.setAddress(addr);
}
- if (publishedEndpointUrl != null && wsdlLocation != null) {
+ if (publishedEndpointUrl != null) {
endpointInfo.setProperty(WSDLGetUtils.PUBLISHED_ENDPOINT_URL, publishedEndpointUrl);
+ }
+ if (publishedEndpointUrl != null && wsdlLocation != null) {
//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
Definition def = endpointInfo.getService()