cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1211550 - in /cxf/branches/2.3.x-fixes: ./ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
Date Wed, 07 Dec 2011 17:30:55 GMT
Author: dkulp
Date: Wed Dec  7 17:30:54 2011
New Revision: 1211550

URL: http://svn.apache.org/viewvc?rev=1211550&view=rev
Log:
Merged revisions 1211549 via svnmerge from 
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes

................
  r1211549 | dkulp | 2011-12-07 12:29:55 -0500 (Wed, 07 Dec 2011) | 9 lines
  
  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.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 (original)
+++ svn:mergeinfo Wed Dec  7 17:30:54 2011
@@ -1,2 +1,2 @@
-/cxf/branches/2.4.x-fixes:1210532
+/cxf/branches/2.4.x-fixes:1210532,1211549
 /cxf/trunk:1210527

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=1211550&r1=1211549&r2=1211550&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
Wed Dec  7 17:30:54 2011
@@ -221,6 +221,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 "



Mime
View raw message