cvs commit: jakarta-tomcat-jasper/jasper34/runtime/org/apache/jasper34/runtime HttpJspBase.java

[costin]

costin      01/06/17 15:42:57

  Modified:    jasper34/generator/org/apache/jasper34/generator
                        DependGenerator.java ServletWriter.java
               jasper34/runtime/org/apache/jasper34/runtime
                        HttpJspBase.java
  Log:
  Small fix, should resolve the problem on windows ( \ in string constants )
  
  Removed an unused variable ( which didn't made sense anyway - pageContext
  is per request, not servlet )
  
  Revision  Changes    Path
  1.2       +1 -0      
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/DependGenerator.java
  
  Index: DependGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/DependGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DependGenerator.java      2001/06/08 04:56:58     1.1
  +++ DependGenerator.java      2001/06/17 22:42:54     1.2
  @@ -87,6 +87,7 @@
       }
       
       public void generateDepends(ServletWriter writer) {
  +     file=file.replace( '\\', '/' );
        writer.println( "\"" + file + "\",");
       }
   }
  
  
  
  1.8       +1 -0      
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/ServletWriter.java
  
  Index: ServletWriter.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/ServletWriter.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ServletWriter.java        2001/06/16 20:41:12     1.7
  +++ ServletWriter.java        2001/06/17 22:42:55     1.8
  @@ -623,6 +623,7 @@
        //                         idx + " " + s );
        if( idx>=0 ) return idx;
   
  +     s=s.replace( '\\', '/' );
        internalFileRegister.addElement( s );
        idx=internalFileRegister.size() -1 ; // added item
        internalFileMap.append("\"").append( s ).append("\" ,\n");
  
  
  
  1.7       +1 -2      
jakarta-tomcat-jasper/jasper34/runtime/org/apache/jasper34/runtime/HttpJspBase.java
  
  Index: HttpJspBase.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper34/runtime/org/apache/jasper34/runtime/HttpJspBase.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- HttpJspBase.java  2001/06/16 20:48:49     1.6
  +++ HttpJspBase.java  2001/06/17 22:42:56     1.7
  @@ -78,8 +78,7 @@
       extends HttpServlet 
       implements HttpJspPage 
   {
  -    protected PageContext pageContext;
  -    protected JspFactory _jspxFactory = null;
  +    protected static JspFactory _jspxFactory = null;
   
       protected HttpJspBase() {
       }