remm 02/02/19 23:09:49
Modified: catalina/src/share/org/apache/catalina/core Tag:
tomcat_40_branch StandardWrapper.java
Log:
- Port fix for bug 4518 (spec compliance issue with jspInit).
- This is a port of fix for 5390 to Tomcat 4.
- This is a nasty hack (but it works). Hopefully, the new Jasper will have a nice way
to handle this, but there's no other solution at the moment :-(
Revision Changes Path
No revision
No revision
1.29.2.8 +16 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
Index: StandardWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
retrieving revision 1.29.2.7
retrieving revision 1.29.2.8
diff -u -r1.29.2.7 -r1.29.2.8
--- StandardWrapper.java 20 Dec 2001 10:00:39 -0000 1.29.2.7
+++ StandardWrapper.java 20 Feb 2002 07:09:48 -0000 1.29.2.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
1.29.2.7 2001/12/20 10:00:39 remm Exp $
- * $Revision: 1.29.2.7 $
- * $Date: 2001/12/20 10:00:39 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
1.29.2.8 2002/02/20 07:09:48 remm Exp $
+ * $Revision: 1.29.2.8 $
+ * $Date: 2002/02/20 07:09:48 $
*
* ====================================================================
*
@@ -90,6 +90,8 @@
import org.apache.catalina.Request;
import org.apache.catalina.Response;
import org.apache.catalina.Wrapper;
+import org.apache.catalina.connector.HttpRequestBase;
+import org.apache.catalina.connector.HttpResponseBase;
import org.apache.catalina.loader.StandardClassLoader;
import org.apache.catalina.util.Enumerator;
import org.apache.catalina.util.InstanceSupport;
@@ -102,7 +104,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.29.2.7 $ $Date: 2001/12/20 10:00:39 $
+ * @version $Revision: 1.29.2.8 $ $Date: 2002/02/20 07:09:48 $
*/
public final class StandardWrapper
@@ -914,6 +916,16 @@
instanceSupport.fireInstanceEvent(InstanceEvent.BEFORE_INIT_EVENT,
servlet);
servlet.init(facade);
+ servlet.init(facade);
+ // Invoke jspInit on JSP pages
+ if ((loadOnStartup > 0) && (jspFile != null)) {
+ // Invoking jspInit
+ HttpRequestBase req = new HttpRequestBase();
+ HttpResponseBase res = new HttpResponseBase();
+ req.setServletPath(jspFile);
+ req.setQueryString("jsp_precompile=true");
+ servlet.service(req, res);
+ }
instanceSupport.fireInstanceEvent(InstanceEvent.AFTER_INIT_EVENT,
servlet);
} catch (UnavailableException f) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
