tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kin...@apache.org
Subject cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Compiler.java
Date Tue, 06 Jan 2004 19:42:40 GMT
kinman      2004/01/06 11:42:40

  Modified:    jasper2/src/share/org/apache/jasper/compiler Compiler.java
  Log:
  - Fix 25787: Directives added to working tag files are not generated.
  
  Revision  Changes    Path
  1.75      +7 -4      jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java
  
  Index: Compiler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- Compiler.java	10 Nov 2003 22:26:20 -0000	1.74
  +++ Compiler.java	6 Jan 2004 19:42:39 -0000	1.75
  @@ -545,25 +545,28 @@
           }
   
           Iterator it = depends.iterator();
  +        boolean outDated = false;
           while (it.hasNext()) {
               String include = (String)it.next();
               try {
                   URL includeUrl = ctxt.getResource(include);
                   if (includeUrl == null) {
                       //System.out.println("Compiler: outdated, no includeUri " + include
);
  -                    return true;
  +                    outDated = true;
                   }
                   if (includeUrl.openConnection().getLastModified() >
                       targetLastModified) {
                       //System.out.println("Compiler: outdated, include old " + include );
  -                    return true;
  +                    outDated = true;
  +                    // Remove any potential Wrappers for tag files
  +                    ctxt.getRuntimeContext().removeWrapper(include);
                   }
               } catch (Exception e) {
                   e.printStackTrace();
  -                return true;
  +                outDated = true;
               }
           }
  -        return false;
  +        return outDated;
   
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message