larryi      02/03/12 19:44:36

  Modified:    src/share/org/apache/jasper JspC.java
  Log:
  Port a couple of fixes from Tomcat 4.x.
  
  Revision  Changes    Path
  1.25      +2 -1      jakarta-tomcat/src/share/org/apache/jasper/JspC.java
  
  Index: JspC.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspC.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- JspC.java 17 Dec 2001 05:18:45 -0000      1.24
  +++ JspC.java 13 Mar 2002 03:44:36 -0000      1.25
  @@ -284,6 +284,7 @@
                   tok = nextArg();
                   if (tok != null) {
                       scratchDir = new File(new File(tok).getAbsolutePath());
  +                    dirset = false;
                   } else {
                       // either an in-java call with an explicit null
                       // or a "-d --" sequence should cause this,
  @@ -407,7 +408,7 @@
                   mappingout.write("\n\t<servlet-mapping>\n\t\t<servlet-name>");
                   mappingout.write(thisServletName);
                   mappingout.write("</servlet-name>\n\t\t<url-pattern>");
  -                mappingout.write(file);
  +                mappingout.write(file.replace('\\', '/'));
                   mappingout.write("</url-pattern>\n\t</servlet-mapping>\n");
               }
               return true;
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to