luehe       2004/10/05 12:06:31

  Modified:    jasper2/src/share/org/apache/jasper/compiler
                        AntCompiler.java JDTCompiler.java
  Log:
  Determine t1 only as needed
  
  Revision  Changes    Path
  1.6       +7 -2      
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/AntCompiler.java
  
  Index: AntCompiler.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/AntCompiler.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AntCompiler.java  4 Oct 2004 20:57:51 -0000       1.5
  +++ AntCompiler.java  5 Oct 2004 19:06:31 -0000       1.6
  @@ -105,7 +105,11 @@
       protected void generateClass(String[] smap)
           throws FileNotFoundException, JasperException, Exception {
           
  -        long t1=System.currentTimeMillis();
  +        long t1 = 0;
  +        if (log.isDebugEnabled()) {
  +            t1 = System.currentTimeMillis();
  +        }
  +
           String javaEncoding = ctxt.getOptions().getJavaEncoding();
           String javaFileName = ctxt.getServletJavaFileName();
           String classpath = ctxt.getClassPath(); 
  @@ -242,7 +246,8 @@
           
           if( log.isDebugEnabled() ) {
               long t2=System.currentTimeMillis();
  -            log.debug( "Compiled " + ctxt.getServletJavaFileName() + " " + (t2-t1) 
+ "ms");
  +            log.debug("Compiled " + ctxt.getServletJavaFileName() + " "
  +                      + (t2-t1) + "ms");
           }
           
           logger = null;
  
  
  
  1.7       +6 -2      
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JDTCompiler.java
  
  Index: JDTCompiler.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JDTCompiler.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JDTCompiler.java  4 Oct 2004 20:57:51 -0000       1.6
  +++ JDTCompiler.java  5 Oct 2004 19:06:31 -0000       1.7
  @@ -80,7 +80,10 @@
       protected void generateClass(String[] smap)
           throws FileNotFoundException, JasperException, Exception {
   
  -        long t1=System.currentTimeMillis();
  +        long t1 = 0;
  +        if (log.isDebugEnabled()) {
  +            t1 = System.currentTimeMillis();
  +        }
           
           final String sourceFile = ctxt.getServletJavaFileName();
           final String outputDir = 
ctxt.getOptions().getScratchDir().getAbsolutePath();
  @@ -388,7 +391,8 @@
           
           if( log.isDebugEnabled() ) {
               long t2=System.currentTimeMillis();
  -            log.debug( "Compiled " + ctxt.getServletJavaFileName() + " " + (t2-t1) 
+ "ms");
  +            log.debug("Compiled " + ctxt.getServletJavaFileName() + " "
  +                      + (t2-t1) + "ms");
           }
   
           if (ctxt.isPrototypeMode()) {
  
  
  

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

Reply via email to