tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r617682 - /tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
Date Fri, 01 Feb 2008 22:32:16 GMT
Author: markt
Date: Fri Feb  1 14:32:13 2008
New Revision: 617682

URL: http://svn.apache.org/viewvc?rev=617682&view=rev
Log:
Revert fix for 43741. Aim for better fix that handles tag files in JARs.

Modified:
    tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java

Modified: tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=617682&r1=617681&r2=617682&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Fri Feb  1 14:32:13 2008
@@ -554,15 +554,7 @@
     
     public void compile() throws JasperException, FileNotFoundException {
         createCompiler();
-        boolean outDated;
-        if (isPackagedTagFile) {
-            // Tags in JARs only need to be compiled once
-            // If the JAR changes, the app needs to be re-loaded
-            outDated = !(new File(getClassFileName()).exists());
-        } else {
-            outDated = jspCompiler.isOutDated();
-        }
-        if (outDated) {
+        if (isPackagedTagFile || jspCompiler.isOutDated()) {
             try {
                 jspCompiler.removeGeneratedFiles();
                 jspLoader = null;



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


Mime
View raw message