You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by as...@apache.org on 2013/05/07 18:42:44 UTC
svn commit: r1479978 - in /cxf/branches/2.7.x-fixes: ./
services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java
Author: asoldano
Date: Tue May 7 16:42:44 2013
New Revision: 1479978
URL: http://svn.apache.org/r1479978
Log:
Merged revisions 1479974 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1479974 | asoldano | 2013-05-07 18:38:21 +0200 (Tue, 07 May 2013) | 2 lines
[CXF-5005] Fix EPR match in WSDiscoveryProvider::handleResolve
........
Modified:
cxf/branches/2.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1479974
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.7.x-fixes/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java?rev=1479978&r1=1479977&r2=1479978&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java (original)
+++ cxf/branches/2.7.x-fixes/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/internal/WSDiscoveryServiceImpl.java Tue May 7 16:42:44 2013
@@ -572,7 +572,7 @@ public class WSDiscoveryServiceImpl impl
QName snr = EndpointReferenceUtils.getServiceName(ref, bus);
QName snc = EndpointReferenceUtils.getServiceName(cref, bus);
String addr = EndpointReferenceUtils.getAddress(ref);
- String addc = EndpointReferenceUtils.getAddress(ref);
+ String addc = EndpointReferenceUtils.getAddress(cref);
if (addr == null) {
return false;