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

[cziegeler]

cziegeler    01/08/14 06:12:32

  Modified:    src/org/apache/cocoon/environment AbstractEnvironment.java
  Log:
  Fixed resolving of absolute paths on windows
  
  Revision  Changes    Path
  1.12      +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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- AbstractEnvironment.java  2001/07/10 08:26:56     1.11
  +++ AbstractEnvironment.java  2001/08/14 13:12:32     1.12
  @@ -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.11 $ $Date: 2001/07/10 08:26:56 $
  + * @version CVS $Revision: 1.12 $ $Date: 2001/08/14 13:12:32 $
    */
   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]