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 2011/12/21 22:00:30 UTC
svn commit: r1221880 - in /cxf/branches/2.4.x-fixes: ./
rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
Author: dkulp
Date: Wed Dec 21 21:00:29 2011
New Revision: 1221880
URL: http://svn.apache.org/viewvc?rev=1221880&view=rev
Log:
Merged revisions 1214335 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1214335 | dkulp | 2011-12-14 11:58:03 -0500 (Wed, 14 Dec 2011) | 3 lines
[CXF-3976] Use the EPR passed into SoapTransportFactory whenever
possible.
Patch from Andrei Shakirin applied
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
Propchange: cxf/branches/2.4.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java?rev=1221880&r1=1221879&r2=1221880&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java (original)
+++ cxf/branches/2.4.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java Wed Dec 21 21:00:29 2011
@@ -200,11 +200,7 @@ public class SoapTransportFactory extend
public Conduit getConduit(EndpointInfo ei, EndpointReferenceType target) throws IOException {
- return getConduit(ei);
- }
-
- public Conduit getConduit(EndpointInfo ei) throws IOException {
- String address = ei.getAddress();
+ String address = target.getAddress().getValue();
if (!StringUtils.isEmpty(address) && address.startsWith("soap.tcp://")) {
//TODO - examine policies and stuff to look for the sun tcp policies
return new TCPConduit(ei);
@@ -229,13 +225,17 @@ public class SoapTransportFactory extend
throw new RuntimeException("Could not find conduit initiator for transport "
+ transId);
}
- return conduitInit.getConduit(ei);
+ return conduitInit.getConduit(ei, target);
} catch (BusException e) {
throw new RuntimeException("Could not find conduit initiator for transport "
+ transId);
}
}
+ public Conduit getConduit(EndpointInfo ei) throws IOException {
+ return getConduit(ei, ei.getTarget());
+ }
+
@Resource(name = "cxf")
public void setBus(Bus bus) {
super.setBus(bus);