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 2012/01/05 20:02:13 UTC
svn commit: r1227760 - in /cxf/branches/2.4.x-fixes: ./
rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
Author: dkulp
Date: Thu Jan 5 19:02:13 2012
New Revision: 1227760
URL: http://svn.apache.org/viewvc?rev=1227760&view=rev
Log:
Merged revisions 1226972 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........
r1226972 | dkulp | 2012-01-03 17:22:56 -0500 (Tue, 03 Jan 2012) | 1 line
Add a NPE guard to SoapTransportFactory
........
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-blocked' - no diff available.
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=1227760&r1=1227759&r2=1227760&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 Thu Jan 5 19:02:13 2012
@@ -202,7 +202,7 @@ public class SoapTransportFactory extend
public Conduit getConduit(EndpointInfo ei, EndpointReferenceType target) throws IOException {
- String address = target.getAddress().getValue();
+ String address = target == null ? ei.getAddress() : 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);