Revert 921464 for rework

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

diff --git a/java/org/apache/jasper/JspCompilationContext.java b/java/org/apache/jasper/JspCompilationContext.java
index 888c44c..a3a8a4a 100644 (file)
--- a/java/org/apache/jasper/JspCompilationContext.java
+++ b/java/org/apache/jasper/JspCompilationContext.java
@@ -595,8 +595,6 @@ 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 b06b75c..8f16a57 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) {
-                    ctxt.compile();
                     firstTime = false;
+                    ctxt.compile();
                 }
             } else {
                 if (compileException != null) {