You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by la...@locus.apache.org on 2000/09/14 02:53:59 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core Response.java
larryi 00/09/13 17:53:59
Modified: src/share/org/apache/tomcat/context
LoadOnStartupInterceptor.java
src/share/org/apache/tomcat/core Response.java
Log:
Use cm.initRequest() to initialize request since it calls response.init()
which can't be done from here.
Removed call to getSession() since a session is not needed when
preloading JSP.
Fix Response.recycle() to tolerate oBuffer being null which occurs when
called from loadJsp().
Revision Changes Path
1.23 +1 -5 jakarta-tomcat/src/share/org/apache/tomcat/context/LoadOnStartupInterceptor.java
Index: LoadOnStartupInterceptor.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/context/LoadOnStartupInterceptor.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- LoadOnStartupInterceptor.java 2000/09/10 21:41:04 1.22
+++ LoadOnStartupInterceptor.java 2000/09/14 00:53:58 1.23
@@ -152,20 +152,16 @@
String path=result.getPath();
Request request = new Request();
Response response = new Response();
- request.setContextManager( cm );
request.recycle();
response.recycle();
+ cm.initRequest(request,response);
- request.setResponse(response);
- response.setRequest(request);
-
String requestURI = path + "?jsp_precompile=true";
request.setRequestURI(context.getPath() + path);
request.setQueryString( "jsp_precompile=true" );
request.setContext(context);
- request.getSession(true);
cm.service( request, response );
}
1.35 +4 -4 jakarta-tomcat/src/share/org/apache/tomcat/core/Response.java
Index: Response.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Response.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Response.java 2000/08/31 18:05:53 1.34
+++ Response.java 2000/09/14 00:53:59 1.35
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Response.java,v 1.34 2000/08/31 18:05:53 nacho Exp $
- * $Revision: 1.34 $
- * $Date: 2000/08/31 18:05:53 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Response.java,v 1.35 2000/09/14 00:53:59 larryi Exp $
+ * $Revision: 1.35 $
+ * $Date: 2000/09/14 00:53:59 $
*
* ====================================================================
*
@@ -193,7 +193,7 @@
started = false;
commited = false;
included=false;
- oBuffer.recycle();
+ if ( oBuffer != null ) oBuffer.recycle();
headers.clear();
}