remm 02/05/14 21:24:45
Modified: coyote/src/java/org/apache/coyote/tomcat4 CoyoteRequest.java
CoyoteResponse.java
Log:
- Clear the facades at the end of the processing of the request.
Revision Changes Path
1.21 +13 -5
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java
Index: CoyoteRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- CoyoteRequest.java 18 Apr 2002 18:12:46 -0000 1.20
+++ CoyoteRequest.java 15 May 2002 04:24:45 -0000 1.21
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
1.20 2002/04/18 18:12:46 remm Exp $
- * $Revision: 1.20 $
- * $Date: 2002/04/18 18:12:46 $
+ * $Header:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
1.21 2002/05/15 04:24:45 remm Exp $
+ * $Revision: 1.21 $
+ * $Date: 2002/05/15 04:24:45 $
*
* ====================================================================
*
@@ -124,7 +124,7 @@
*
* @author Remy Maucherat
* @author Craig R. McClanahan
- * @version $Revision: 1.20 $ $Date: 2002/04/18 18:12:46 $
+ * @version $Revision: 1.21 $ $Date: 2002/05/15 04:24:45 $
*/
public class CoyoteRequest
@@ -412,6 +412,11 @@
parameterMap.setLocked(false);
parameterMap.clear();
+ if (facade != null) {
+ facade.clear();
+ facade = null;
+ }
+
}
@@ -507,13 +512,16 @@
/**
* The facade associated with this request.
*/
- protected HttpRequestFacade facade = new HttpRequestFacade(this);
+ protected HttpRequestFacade facade = null;
/**
* Return the <code>ServletRequest</code> for which this object
* is the facade. This method must be implemented by a subclass.
*/
public ServletRequest getRequest() {
+ if (facade == null) {
+ facade = new HttpRequestFacade(this);
+ }
return (facade);
}
1.15 +15 -5
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java
Index: CoyoteResponse.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- CoyoteResponse.java 9 Apr 2002 17:26:07 -0000 1.14
+++ CoyoteResponse.java 15 May 2002 04:24:45 -0000 1.15
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java,v
1.14 2002/04/09 17:26:07 costin Exp $
- * $Revision: 1.14 $
- * $Date: 2002/04/09 17:26:07 $
+ * $Header:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteResponse.java,v
1.15 2002/05/15 04:24:45 remm Exp $
+ * $Revision: 1.15 $
+ * $Date: 2002/05/15 04:24:45 $
*
* ====================================================================
*
@@ -116,7 +116,7 @@
*
* @author Remy Maucherat
* @author Craig R. McClanahan
- * @version $Revision: 1.14 $ $Date: 2002/04/09 17:26:07 $
+ * @version $Revision: 1.15 $ $Date: 2002/05/15 04:24:45 $
*/
public class CoyoteResponse
@@ -306,6 +306,7 @@
* preparation for reuse of this object.
*/
public void recycle() {
+
outputBuffer.recycle();
usingOutputStream = false;
usingWriter = false;
@@ -313,6 +314,12 @@
included = false;
error = false;
cookies.clear();
+
+ if (facade != null) {
+ facade.clear();
+ facade = null;
+ }
+
}
@@ -399,13 +406,16 @@
/**
* The facade associated with this response.
*/
- protected HttpResponseFacade facade = new HttpResponseFacade(this);
+ protected HttpResponseFacade facade = null;
/**
* Return the <code>ServletResponse</code> for which this object
* is the facade.
*/
public ServletResponse getResponse() {
+ if (facade == null) {
+ facade = new HttpResponseFacade(this);
+ }
return (facade);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
