cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r832824 - in /cxf/branches/2.1.x-fixes: ./ common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
Date Wed, 04 Nov 2009 18:08:43 GMT
Author: dkulp
Date: Wed Nov  4 18:08:42 2009
New Revision: 832824

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

................
  r831418 | dkulp | 2009-10-30 14:43:54 -0400 (Fri, 30 Oct 2009) | 9 lines
  
  Merged revisions 831417 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r831417 | dkulp | 2009-10-30 14:40:20 -0400 (Fri, 30 Oct 2009) | 1 line
    
    Add NPE guard
  ........
................

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java

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

Modified: cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java?rev=832824&r1=832823&r2=832824&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
(original)
+++ cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/resource/URIResolver.java
Wed Nov  4 18:08:42 2009
@@ -203,7 +203,10 @@
             // do nothing
         }
 
-        if (uri != null && "file".equals(uri.getScheme())) {
+        if (is == null && baseUriStr != null && baseUriStr.startsWith("classpath:"))
{
+            tryClasspath(baseUriStr + uriStr);
+        }
+        if (is == null && uri != null && "file".equals(uri.getScheme()))
{
             try {
                 file = new File(uri);
             } catch (IllegalArgumentException iae) {



Mime
View raw message