costin      01/06/12 18:11:39

  Modified:    jasper34/generator/org/apache/jasper34/generator
                        CharDataGenerator.java
               jasper34/liaison/org/apache/jasper34/tomcat33
                        JspInterceptor.java
  Log:
  2 bug fixes.
  
  - JspInterceptor - need to reset depend manager after compiling. Before
  compiling the DM set expired ( shouldReload=true ), and unless we reset it
  the field will remain as expired, even if we recompile.
  
  - In Char writer, the line number fix introduced a regression - it does
  print() then println() ( which indents ). ( previous code had a \n - that
  was bad because it braked the line numbering ). Now use printlnNI ( non-indent)
  
  Revision  Changes    Path
  1.4       +4 -4      
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/CharDataGenerator.java
  
  Index: CharDataGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/CharDataGenerator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CharDataGenerator.java    2001/06/09 21:23:31     1.3
  +++ CharDataGenerator.java    2001/06/13 01:11:35     1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/CharDataGenerator.java,v
 1.3 2001/06/09 21:23:31 costin Exp $
  - * $Revision: 1.3 $
  - * $Date: 2001/06/09 21:23:31 $
  + * $Header: 
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/generator/CharDataGenerator.java,v
 1.4 2001/06/13 01:11:35 costin Exp $
  + * $Revision: 1.4 $
  + * $Date: 2001/06/13 01:11:35 $
    *
    * ====================================================================
    * 
  @@ -127,7 +127,7 @@
            }
        }
        writer.print(sb.toString());
  -     writer.println("\");");
  +     writer.printlnNI("\");");
       }
   
   
  
  
  
  1.7       +5 -2      
jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/tomcat33/JspInterceptor.java
  
  Index: JspInterceptor.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper34/liaison/org/apache/jasper34/tomcat33/JspInterceptor.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JspInterceptor.java       2001/06/12 15:45:28     1.6
  +++ JspInterceptor.java       2001/06/13 01:11:37     1.7
  @@ -442,6 +442,9 @@
        JasperLiaison liasion=new JasperLiaison(getLog(), debug);
        liasion.processJspFile( req, jspFile, handler, args);
   
  +     dep= handler.getServletInfo().getDependManager();
  +     dep.reset();
  +     
        if( pre_compile ) {
            // we may have compiled the page ( if needed ), but
            // we can't execute it. The handler will just
  @@ -574,7 +577,7 @@
                if( depM == null )
                    log.log( "DepM==null ");
                else
  -                 log.log( "DepM.shouldReload()");
  +                 log.log( "DepM.shouldReload()" + depM.shouldReload());
            Context ctx=req.getContext();
            
            // Mangle the names - expensive operation, but nothing
  @@ -849,7 +852,7 @@
        // create a lastModified checker.
        if( debug>0) log.log("Registering dependency for " + handler );
        DependManager depM=new DependManager(4); // jsps have fewer deps
  -     
  +     depM.setDebug( debug );
        Dependency dep=new Dependency();
        File depFile=new File(getJspFilePath(ctx.getAbsolutePath(),
                                             pageInfo));
  
  
  

Reply via email to