You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2001/05/14 06:12:35 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector HttpRequestBase.java HttpResponseBase.java RequestBase.java ResponseBase.java
remm 01/05/13 21:12:35
Modified: catalina/src/share/org/apache/catalina/connector
HttpRequestBase.java HttpResponseBase.java
RequestBase.java ResponseBase.java
Log:
- Return facade objects instead of the unsafe internal request / response
objects.
Revision Changes Path
1.23 +16 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestBase.java
Index: HttpRequestBase.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestBase.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- HttpRequestBase.java 2001/05/03 19:15:05 1.22
+++ HttpRequestBase.java 2001/05/14 04:12:30 1.23
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestBase.java,v 1.22 2001/05/03 19:15:05 craigmcc Exp $
- * $Revision: 1.22 $
- * $Date: 2001/05/03 19:15:05 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpRequestBase.java,v 1.23 2001/05/14 04:12:30 remm Exp $
+ * $Revision: 1.23 $
+ * $Date: 2001/05/14 04:12:30 $
*
* ====================================================================
*
@@ -79,6 +79,7 @@
import java.util.Locale;
import java.util.Map;
import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletRequest;
import javax.servlet.ServletInputStream;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
@@ -100,7 +101,7 @@
* be implemented.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.22 $ $Date: 2001/05/03 19:15:05 $
+ * @version $Revision: 1.23 $ $Date: 2001/05/14 04:12:30 $
*/
public class HttpRequestBase
@@ -258,6 +259,17 @@
public String getInfo() {
return (info);
+
+ }
+
+
+ /**
+ * Return the <code>ServletRequest</code> for which this object
+ * is the facade. This method must be implemented by a subclass.
+ */
+ public ServletRequest getRequest() {
+
+ return new HttpRequestFacade(this);
}
1.31 +19 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java
Index: HttpResponseBase.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- HttpResponseBase.java 2001/04/18 20:40:30 1.30
+++ HttpResponseBase.java 2001/05/14 04:12:31 1.31
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v 1.30 2001/04/18 20:40:30 craigmcc Exp $
- * $Revision: 1.30 $
- * $Date: 2001/04/18 20:40:30 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/HttpResponseBase.java,v 1.31 2001/05/14 04:12:31 remm Exp $
+ * $Revision: 1.31 $
+ * $Date: 2001/05/14 04:12:31 $
*
* ====================================================================
*
@@ -79,6 +79,7 @@
import java.util.Iterator;
import java.util.Locale;
import java.util.TimeZone;
+import javax.servlet.ServletResponse;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -99,7 +100,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.30 $ $Date: 2001/04/18 20:40:30 $
+ * @version $Revision: 1.31 $ $Date: 2001/05/14 04:12:31 $
*/
public class HttpResponseBase
@@ -158,6 +159,20 @@
* The time zone with which to construct date headers.
*/
protected static final TimeZone zone = TimeZone.getTimeZone("GMT");
+
+
+ // ------------------------------------------------------------- Properties
+
+
+ /**
+ * Return the <code>ServletResponse</code> for which this object
+ * is the facade.
+ */
+ public ServletResponse getResponse() {
+
+ return new HttpResponseFacade(this);
+
+ }
// --------------------------------------------------------- Public Methods
1.12 +5 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java
Index: RequestBase.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- RequestBase.java 2001/04/26 17:23:34 1.11
+++ RequestBase.java 2001/05/14 04:12:31 1.12
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java,v 1.11 2001/04/26 17:23:34 craigmcc Exp $
- * $Revision: 1.11 $
- * $Date: 2001/04/26 17:23:34 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/RequestBase.java,v 1.12 2001/05/14 04:12:31 remm Exp $
+ * $Revision: 1.12 $
+ * $Date: 2001/05/14 04:12:31 $
*
* ====================================================================
*
@@ -98,7 +98,7 @@
* the connector-specific methods need to be implemented.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.11 $ $Date: 2001/04/26 17:23:34 $
+ * @version $Revision: 1.12 $ $Date: 2001/05/14 04:12:31 $
*/
public abstract class RequestBase
@@ -345,7 +345,7 @@
*/
public ServletRequest getRequest() {
- return ((ServletRequest) this);
+ return new RequestFacade(this);
}
1.12 +5 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java
Index: ResponseBase.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ResponseBase.java 2001/03/28 05:35:24 1.11
+++ ResponseBase.java 2001/05/14 04:12:32 1.12
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java,v 1.11 2001/03/28 05:35:24 remm Exp $
- * $Revision: 1.11 $
- * $Date: 2001/03/28 05:35:24 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java,v 1.12 2001/05/14 04:12:32 remm Exp $
+ * $Revision: 1.12 $
+ * $Date: 2001/05/14 04:12:32 $
*
* ====================================================================
*
@@ -88,7 +88,7 @@
* the connector-specific methods need to be implemented.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.11 $ $Date: 2001/03/28 05:35:24 $
+ * @version $Revision: 1.12 $ $Date: 2001/05/14 04:12:32 $
*/
public abstract class ResponseBase
@@ -331,7 +331,7 @@
*/
public ServletResponse getResponse() {
- return ((ServletResponse) this);
+ return new ResponseFacade(this);
}