Fix secondary issue reported as part of bug47013

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

diff --git a/java/org/apache/catalina/core/Constants.java b/java/org/apache/catalina/core/Constants.java
index c0bff3e..fec6b6e 100644 (file)
--- a/java/org/apache/catalina/core/Constants.java
+++ b/java/org/apache/catalina/core/Constants.java
@@ -28,5 +28,8 @@ public class Constants {
     public static final String JSP_SERVLET_CLASS =
         "org.apache.jasper.servlet.JspServlet";
     public static final String JSP_SERVLET_NAME = "jsp";
+    public static final String PRECOMPILE = 
+        System.getProperty("org.apache.jasper.Constants.PRECOMPILE",
+                "jsp_precompile");
 
 }

diff --git a/java/org/apache/catalina/core/StandardWrapper.java b/java/org/apache/catalina/core/StandardWrapper.java
index 3b80b39..8126a12 100644 (file)
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -1070,7 +1070,8 @@ public class StandardWrapper
                     // Invoking jspInit
                     DummyRequest req = new DummyRequest();
                     req.setServletPath(jspFile);
-                    req.setQueryString("jsp_precompile=true");
+                    req.setQueryString(Constants.PRECOMPILE +
+                            "jsp_precompile=true");
                     DummyResponse res = new DummyResponse();
 
                     if( Globals.IS_SECURITY_ENABLED) {