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/07 18:29:56 UTC

svn commit: r1211549 - 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  7 17:29:55 2011
New Revision: 1211549

URL: http://svn.apache.org/viewvc?rev=1211549&view=rev
Log:
Merged revisions 1211547 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1211547 | dkulp | 2011-12-07 12:25:30 -0500 (Wed, 07 Dec 2011) | 1 line
  
  [CXF-3961] Better exception if conduit cannot be found
........

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/
------------------------------------------------------------------------------
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=1211549&r1=1211548&r2=1211549&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  7 17:29:55 2011
@@ -225,6 +225,10 @@ public class SoapTransportFactory extend
             } else {
                 conduitInit = mgr.getConduitInitiatorForUri(address);
             }
+            if (conduitInit == null) {
+                throw new RuntimeException("Could not find conduit initiator for transport "
+                        + transId);
+            }
             return conduitInit.getConduit(ei);
         } catch (BusException e) {
             throw new RuntimeException("Could not find conduit initiator for transport "