cvs commit: xml-cocoon2/src/org/apache/cocoon/environment AbstractEnvironment.java

[cziegeler]

cziegeler    01/08/14 06:12:45

  Modified:    src/org/apache/cocoon/environment Tag: cocoon_20_branch
                        AbstractEnvironment.java
  Log:
  Fixed resolving of absolute paths on windows
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.6.2.6   +4 -1      
xml-cocoon2/src/org/apache/cocoon/environment/AbstractEnvironment.java
  
  Index: AbstractEnvironment.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/AbstractEnvironment.java,v
  retrieving revision 1.6.2.5
  retrieving revision 1.6.2.6
  diff -u -r1.6.2.5 -r1.6.2.6
  --- AbstractEnvironment.java  2001/07/10 08:24:55     1.6.2.5
  +++ AbstractEnvironment.java  2001/08/14 13:12:45     1.6.2.6
  @@ -25,7 +25,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
  - * @version CVS $Revision: 1.6.2.5 $ $Date: 2001/07/10 08:24:55 $
  + * @version CVS $Revision: 1.6.2.6 $ $Date: 2001/08/14 13:12:45 $
    */
   public abstract class AbstractEnvironment extends AbstractLoggable implements 
Environment {
   
  @@ -229,6 +229,9 @@
               source = this.sourceHandler.getSource(this, systemId);
           } else if (systemId.charAt(0) == '/') {
               source = this.sourceHandler.getSource(this, this.context.getProtocol() 
+ ":" + systemId);
  +        // windows: absolute paths can start with drive letter
  +        } else if (systemId.length() > 1 && systemId.charAt(1) == ':') {
  +            source = this.sourceHandler.getSource(this, this.context.getProtocol() 
+ ":/" + systemId);
           } else {
               source = this.sourceHandler.getSource(this, this.context, systemId);
           }
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]