Author: dkulp Date: Thu Jan 5 19:31:08 2012 New Revision: 1227780 URL: http://svn.apache.org/viewvc?rev=1227780&view=rev Log: Merged revisions 1221914 via svnmerge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1221914 | dkulp | 2011-12-21 17:26:02 -0500 (Wed, 21 Dec 2011) | 10 lines Merged revisions 1221874 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1221874 | dkulp | 2011-12-21 15:53:07 -0500 (Wed, 21 Dec 2011) | 2 lines [CXF-3991] Better error message when conduit cannot be found. Patch from Andrei Shakirin applied. ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java Propchange: cxf/branches/2.3.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java?rev=1227780&r1=1227779&r2=1227780&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java (original) +++ cxf/branches/2.3.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java Thu Jan 5 19:31:08 2012 @@ -64,6 +64,8 @@ import org.apache.cxf.wsdl11.WSDLEndpoin public class SoapTransportFactory extends AbstractTransportFactory implements DestinationFactory, WSDLEndpointFactory, ConduitInitiator { + public static final String CANNOT_GET_CONDUIT_ERROR + = "Could not find conduit initiator for address: %s and transport: %s"; public static final String SOAP_11_HTTP_BINDING = "http://schemas.xmlsoap.org/soap/http";; public static final String SOAP_12_HTTP_BINDING = "http://www.w3.org/2003/05/soap/bindings/HTTP/";; @@ -222,13 +224,11 @@ public class SoapTransportFactory extend conduitInit = mgr.getConduitInitiatorForUri(address); } if (conduitInit == null) { - throw new RuntimeException("Could not find conduit initiator for transport " - + transId); + throw new RuntimeException(String.format(CANNOT_GET_CONDUIT_ERROR, address, transId)); } return conduitInit.getConduit(ei); } catch (BusException e) { - throw new RuntimeException("Could not find conduit initiator for transport " - + transId); + throw new RuntimeException(String.format(CANNOT_GET_CONDUIT_ERROR, address, transId)); } }
