Re: svn commit: r764985 - in /tomcat/trunk/java/org/apache/catalina/core: Constants.java StandardWrapper.java

2009-04-14 Thread Mark Thomas 
sebb wrote:
> On 14/04/2009, ma...@apache.org  wrote:
>> Author: markt
>>  Date: Tue Apr 14 22:16:53 2009
>>  New Revision: 764985
>>
>>  URL: http://svn.apache.org/viewvc?rev=764985&view=rev
>>  Log:
>>  Fix secondary issue reported as part of bug47013
> 
> Which says:
> 
> req.setQueryString(Constants.PRECOMPILE + "=true");

Cheers - bad copy and paste.

Mark



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

Re: svn commit: r764985 - in /tomcat/trunk/java/org/apache/catalina/core: Constants.java StandardWrapper.java

2009-04-14 Thread sebb 
On 14/04/2009, ma...@apache.org  wrote:
> Author: markt
>  Date: Tue Apr 14 22:16:53 2009
>  New Revision: 764985
>
>  URL: http://svn.apache.org/viewvc?rev=764985&view=rev
>  Log:
>  Fix secondary issue reported as part of bug47013

Which says:

req.setQueryString(Constants.PRECOMPILE + "=true");


>  Modified:
> tomcat/trunk/java/org/apache/catalina/core/Constants.java
> tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
>
>  Modified: tomcat/trunk/java/org/apache/catalina/core/Constants.java
>  URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/Constants.java?rev=764985&r1=764984&r2=764985&view=diff
>  
> ==
>  --- tomcat/trunk/java/org/apache/catalina/core/Constants.java (original)
>  +++ tomcat/trunk/java/org/apache/catalina/core/Constants.java Tue Apr 14 
> 22:16:53 2009
>  @@ -28,5 +28,8 @@
>  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");
>
>   }
>
>  Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
>  URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=764985&r1=764984&r2=764985&view=diff
>  
> ==
>  --- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java 
> (original)
>  +++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Tue Apr 
> 14 22:16:53 2009
>  @@ -1070,7 +1070,8 @@
>  // Invoking jspInit
>  DummyRequest req = new DummyRequest();
>  req.setServletPath(jspFile);
>  -req.setQueryString("jsp_precompile=true");
>  +req.setQueryString(Constants.PRECOMPILE +
>  +"jsp_precompile=true");

Looks like that last line should be:

"=true");

since Constants.PRECOMPILE="jsp_precompile" (as a default)

But I could be wrong ...

>  DummyResponse res = new DummyResponse();
>
>  if( Globals.IS_SECURITY_ENABLED) {
>
>
>
>  -
>  To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>  For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

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

svn commit: r764985 - in /tomcat/trunk/java/org/apache/catalina/core: Constants.java StandardWrapper.java

2009-04-14 Thread markt 
Author: markt
Date: Tue Apr 14 22:16:53 2009
New Revision: 764985

URL: http://svn.apache.org/viewvc?rev=764985&view=rev
Log:
Fix secondary issue reported as part of bug47013

Modified:
tomcat/trunk/java/org/apache/catalina/core/Constants.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java

Modified: tomcat/trunk/java/org/apache/catalina/core/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/Constants.java?rev=764985&r1=764984&r2=764985&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/Constants.java Tue Apr 14 
22:16:53 2009
@@ -28,5 +28,8 @@
 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");
 
 }

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=764985&r1=764984&r2=764985&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Tue Apr 14 
22:16:53 2009
@@ -1070,7 +1070,8 @@
 // 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) {



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