avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/source SourceResolverImpl.java
Date Tue, 19 Feb 2002 12:05:05 GMT
cziegeler    02/02/19 04:05:05

  Modified:    src/scratchpad/org/apache/avalon/excalibur/source
                        SourceResolverImpl.java
  Log:
  Small file URI handling fix
  
  Revision  Changes    Path
  1.18      +6 -5      jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/source/SourceResolverImpl.java
  
  Index: SourceResolverImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/source/SourceResolverImpl.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- SourceResolverImpl.java	18 Feb 2002 12:33:08 -0000	1.17
  +++ SourceResolverImpl.java	19 Feb 2002 12:05:05 -0000	1.18
  @@ -53,7 +53,7 @@
    *
    * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version $Id: SourceResolverImpl.java,v 1.17 2002/02/18 12:33:08 cziegeler Exp $
  + * @version $Id: SourceResolverImpl.java,v 1.18 2002/02/19 12:05:05 cziegeler Exp $
    */
   public class SourceResolverImpl
   extends AbstractLogEnabled
  @@ -168,17 +168,18 @@
   
           if (location.length() == 0) {
               systemID = baseURI;
  -        } else if (location.indexOf(":") > 1)
  -        {
  -            systemID = location;
           }
           else if (location.charAt(0) == '/')
           {
               final int protocolEnd = baseURI.indexOf(':');
               systemID = new StringBuffer(baseURI.substring( protocolEnd + 1))
                                  .append(location).toString();
  -        // windows: absolute paths can start with drive letter
           }
  +        else if (location.indexOf(":") > 1)
  +        {
  +            systemID = location;
  +        }
  +        // windows: absolute paths can start with drive letter
           else if (location.length() > 1 && location.charAt(1) == ':')
           {
               systemID = new StringBuffer("file:/").append(location).toString();
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message