Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48795

If compilation fails, always try to re-compile the next time around

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@921464 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/jasper/JspCompilationContext.java b/java/org/apache/jasper/JspCompilationContext.java
index a3a8a4a..888c44c 100644 (file)
--- a/java/org/apache/jasper/JspCompilationContext.java
+++ b/java/org/apache/jasper/JspCompilationContext.java
@@ -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(

diff --git a/java/org/apache/jasper/servlet/JspServletWrapper.java b/java/org/apache/jasper/servlet/JspServletWrapper.java
index 8f16a57..b06b75c 100644 (file)
--- a/java/org/apache/jasper/servlet/JspServletWrapper.java
+++ b/java/org/apache/jasper/servlet/JspServletWrapper.java
@@ -202,8 +202,8 @@ public class JspServletWrapper {
             }
             if (options.getDevelopment() || firstTime ) {
                 synchronized (this) {
-                    firstTime = false;
                     ctxt.compile();
+                    firstTime = false;
                 }
             } else {
                 if (compileException != null) {