Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 75167 invoked by uid 500); 3 Sep 2001 03:36:02 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: tomcat-dev@jakarta.apache.org Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 75158 invoked by uid 500); 3 Sep 2001 03:36:01 -0000 Delivered-To: apmail-jakarta-tomcat-4.0-cvs@apache.org Date: 3 Sep 2001 03:34:08 -0000 Message-ID: <20010903033408.65269.qmail@icarus.apache.org> From: remm@apache.org To: jakarta-tomcat-4.0-cvs@apache.org Subject: cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler ParserController.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N remm 01/09/02 20:34:08 Modified: jasper/src/share/org/apache/jasper/compiler ParserController.java Log: - Fix (again) bug 821. Revision Changes Path 1.17 +4 -4 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParserController.java Index: ParserController.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ParserController.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ParserController.java 2001/07/10 20:12:07 1.16 +++ ParserController.java 2001/09/03 03:34:08 1.17 @@ -413,10 +413,10 @@ * baseDirStack. */ private String resolveFileName(String inFileName) { - boolean isAbsolute = inFileName.startsWith("/"); - String fileName = - isAbsolute ? - inFileName : (String) baseDirStack.peek() + inFileName; + String fileName = inFileName.replace('\\', '/'); + boolean isAbsolute = fileName.startsWith("/"); + fileName = isAbsolute ? fileName + : (String) baseDirStack.peek() + fileName; String baseDir = fileName.substring(0, fileName.lastIndexOf("/") + 1); baseDirStack.push(baseDir);