tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r921464 - in /tomcat/trunk/java/org/apache/jasper: JspCompilationContext.java servlet/JspServletWrapper.java
Date Wed, 10 Mar 2010 17:35:43 GMT
Author: markt
Date: Wed Mar 10 17:35:43 2010
New Revision: 921464

URL: http://svn.apache.org/viewvc?rev=921464&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48795
If compilation fails, always try to re-compile the next time around

Modified:
    tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
    tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.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=921464&r1=921463&r2=921464&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Wed Mar 10 17:35:43 2010
@@ -595,6 +595,8 @@ public class JspCompilationContext {
             } catch (JasperException ex) {
                 // Cache compilation exception
                 jsw.setCompilationException(ex);
+                // Make sure recompilation is attempted
+                jsw.setLastModificationTest(-1);
                 throw ex;
             } catch (Exception ex) {
                 JasperException je = new JasperException(

Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=921464&r1=921463&r2=921464&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Wed Mar 10 17:35:43
2010
@@ -202,8 +202,8 @@ public class JspServletWrapper {
             }
             if (options.getDevelopment() || firstTime ) {
                 synchronized (this) {
-                    firstTime = false;
                     ctxt.compile();
+                    firstTime = false;
                 }
             } else {
                 if (compileException != null) {



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


Mime
View raw message