You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ho...@apache.org on 2001/03/15 01:31:42 UTC
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler ParserController.java
horwat 01/03/14 16:31:41
Modified: jasper/src/share/org/apache/jasper/compiler
ParserController.java
Log:
Bug Fix: jspc didn't work well under windows since file separator assumed to be "/" in ParserController.resolveFileName
Bugzilla: #821 & #487
Revision Changes Path
1.10 +2 -2 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ParserController.java 2000/12/22 18:37:39 1.9
+++ ParserController.java 2001/03/15 00:31:41 1.10
@@ -417,12 +417,12 @@
* baseDirStack.
*/
private String resolveFileName(String inFileName) {
- boolean isAbsolute = inFileName.startsWith("/");
+ boolean isAbsolute = inFileName.startsWith(File.separator);
String fileName =
isAbsolute ?
inFileName : (String)baseDirStack.peek() + inFileName;
String baseDir =
- inFileName.substring(0, inFileName.lastIndexOf("/") + 1);
+ inFileName.substring(0, inFileName.lastIndexOf(File.separator) + 1);
baseDirStack.push(baseDir);
return fileName;
}
Re: JSPC on Windows (RE: cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler ParserController.java)
Posted by horwat <Ju...@Sun.COM>.
The inline patch you sent along with the patch I'm including would also fix
Bugzilla #412.
Justy
> Justyna,
>
> Would this update also fix Bugzilla 412?
>
> Marc Saegesser
>
> > -----Original Message-----
> > From: horwat@apache.org [mailto:horwat@apache.org]
> > Sent: Wednesday, March 14, 2001 6:32 PM
> > To: jakarta-tomcat-4.0-cvs@apache.org
> > Subject: cvs commit:
> > jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler
> > ParserController.java
> >
> >
> > horwat 01/03/14 16:31:41
> >
> > Modified: jasper/src/share/org/apache/jasper/compiler
> > ParserController.java
> > Log:
> > Bug Fix: jspc didn't work well under windows since file
> > separator assumed to be "/" in ParserController.resolveFileName
> >
> > Bugzilla: #821 & #487
> >
> > Revision Changes Path
> > 1.10 +2 -2
> > jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Par
> serController.java
> >
> > Index: ParserController.java
> > ===================================================================
> > RCS file:
> > /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/co
> mpiler/ParserController.java,v
> > retrieving revision 1.9
> > retrieving revision 1.10
> > diff -u -r1.9 -r1.10
> > --- ParserController.java 2000/12/22 18:37:39 1.9
> > +++ ParserController.java 2001/03/15 00:31:41 1.10
> > @@ -417,12 +417,12 @@
> > * baseDirStack.
> > */
> > private String resolveFileName(String inFileName) {
> > - boolean isAbsolute = inFileName.startsWith("/");
> > + boolean isAbsolute = inFileName.startsWith(File.separator);
> > String fileName =
> > isAbsolute ?
> > inFileName : (String)baseDirStack.peek() + inFileName;
> > String baseDir =
> > - inFileName.substring(0, inFileName.lastIndexOf("/") + 1);
> > + inFileName.substring(0,
> > inFileName.lastIndexOf(File.separator) + 1);
> > baseDirStack.push(baseDir);
> > return fileName;
> > }
> >
> >
> >
>
JSPC on Windows (RE: cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler ParserController.java)
Posted by Marc Saegesser <ma...@apropos.com>.
Justyna,
Would this update also fix Bugzilla 412?
Marc Saegesser
> -----Original Message-----
> From: horwat@apache.org [mailto:horwat@apache.org]
> Sent: Wednesday, March 14, 2001 6:32 PM
> To: jakarta-tomcat-4.0-cvs@apache.org
> Subject: cvs commit:
> jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler
> ParserController.java
>
>
> horwat 01/03/14 16:31:41
>
> Modified: jasper/src/share/org/apache/jasper/compiler
> ParserController.java
> Log:
> Bug Fix: jspc didn't work well under windows since file
> separator assumed to be "/" in ParserController.resolveFileName
>
> Bugzilla: #821 & #487
>
> Revision Changes Path
> 1.10 +2 -2
> jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Par
serController.java
>
> Index: ParserController.java
> ===================================================================
> RCS file:
> /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/co
mpiler/ParserController.java,v
> retrieving revision 1.9
> retrieving revision 1.10
> diff -u -r1.9 -r1.10
> --- ParserController.java 2000/12/22 18:37:39 1.9
> +++ ParserController.java 2001/03/15 00:31:41 1.10
> @@ -417,12 +417,12 @@
> * baseDirStack.
> */
> private String resolveFileName(String inFileName) {
> - boolean isAbsolute = inFileName.startsWith("/");
> + boolean isAbsolute = inFileName.startsWith(File.separator);
> String fileName =
> isAbsolute ?
> inFileName : (String)baseDirStack.peek() + inFileName;
> String baseDir =
> - inFileName.substring(0, inFileName.lastIndexOf("/") + 1);
> + inFileName.substring(0,
> inFileName.lastIndexOf(File.separator) + 1);
> baseDirStack.push(baseDir);
> return fileName;
> }
>
>
>