svn commit: r1186406 - in /cxf/branches/2.3.x-fixes: ./ api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java

[dkulp]

Author: dkulp
Date: Wed Oct 19 19:03:34 2011
New Revision: 1186406

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

................
  r1186395 | dkulp | 2011-10-19 14:50:36 -0400 (Wed, 19 Oct 2011) | 9 lines
  
  Merged revisions 1186384 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1186384 | dkulp | 2011-10-19 14:27:03 -0400 (Wed, 19 Oct 2011) | 1 line
    
    [CXF-3863] For the "built in" resolvers, don't recheck with the conduits
  ........
................

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    
cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java?rev=1186406&r1=1186405&r2=1186406&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
 Wed Oct 19 19:03:34 2011
@@ -87,7 +87,8 @@ public class TransportURIResolver extend
             //nothing
         }
         if (is == null && base != null 
-            && base.getScheme() != null) {
+            && base.getScheme() != null
+            && !DEFAULT_URI_RESOLVER_HANDLES.contains(base.getScheme())) {
             try {
                 ConduitInitiatorManager mgr = 
bus.getExtension(ConduitInitiatorManager.class);
                 ConduitInitiator ci = null;