craigmcc 01/07/16 15:24:33
Modified: catalina/src/share/org/apache/catalina/core
ApplicationHttpRequest.java
ApplicationHttpResponse.java
ApplicationRequest.java ApplicationResponse.java
Log:
Remove cruft code that had been previously commented out. No functional
change.
Revision Changes Path
1.9 +5 -68
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java
Index: ApplicationHttpRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ApplicationHttpRequest.java 2001/07/13 00:51:45 1.8
+++ ApplicationHttpRequest.java 2001/07/16 22:24:32 1.9
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v
1.8 2001/07/13 00:51:45 craigmcc Exp $
- * $Revision: 1.8 $
- * $Date: 2001/07/13 00:51:45 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpRequest.java,v
1.9 2001/07/16 22:24:32 craigmcc Exp $
+ * $Revision: 1.9 $
+ * $Date: 2001/07/16 22:24:32 $
*
* ====================================================================
*
@@ -94,7 +94,7 @@
* keep these two classes in synchronization when making changes!
*
* @author Craig R. McClanahan
- * @version $Revision: 1.8 $ $Date: 2001/07/13 00:51:45 $
+ * @version $Revision: 1.9 $ $Date: 2001/07/16 22:24:32 $
*/
class ApplicationHttpRequest extends HttpServletRequestWrapper {
@@ -159,14 +159,6 @@
/**
- * The parent object that is actually an internal request object.
- */
- /*
- protected HttpServletRequest parent = null;
- */
-
-
- /**
* The path information for this request.
*/
protected String pathInfo = null;
@@ -408,42 +400,6 @@
/**
- * Calculate and set the parent of the wrapped servlet request that is
- * actually an internal <code>Request</code> implementation.
- *
- * @exception IllegalArgumentException if a parent Request cannot be
- * identified
- */
- /*
- void calculateParent() {
-
- HttpServletRequest request = (HttpServletRequest) getRequest();
- if (request == null) {
- this.parent = null;
- return;
- }
- while (request != null) {
- if ((request instanceof HttpRequest)
- || (request instanceof HttpRequestFacade))
- break;
- if (!(request instanceof HttpServletRequestWrapper)) {
- throw new IllegalArgumentException
- (sm.getString("applicationRequest.badRequest"));
- }
- request = (HttpServletRequest)
- ((HttpServletRequestWrapper) request).getRequest();
- }
- if (request == null) {
- throw new IllegalArgumentException
- (sm.getString("applicationRequest.badParent"));
- }
- this.parent = request;
-
- }
- */
-
-
- /**
* Perform a shallow copy of the specified Map, and return the result.
*
* @param orig Origin Map to be copied
@@ -466,19 +422,6 @@
/**
- * Get the parent of the wrapped servlet request that is actually an
- * internal Request implementation.
- */
- /*
- HttpServletRequest getParent() {
-
- return (this.parent);
-
- }
- */
-
-
- /**
* Merge the parameters from the specified query string (if any), and
* the parameters already present on this request (if any), such that
* the parameter values from the query string show up first if there are
@@ -559,16 +502,10 @@
* Set the request that we are wrapping.
*
* @param request The new wrapped request
- *
- * @exception IllegalArgumentException if a parent Request implementation
- * cannot be identified
*/
void setRequest(HttpServletRequest request) {
- ; // FIXME - cannot change the private "request" variable
- /*
- calculateParent();
- */
+ super.setRequest(request);
// Initialize the attributes for this request
synchronized (attributes) {
1.5 +5 -74
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpResponse.java
Index: ApplicationHttpResponse.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpResponse.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ApplicationHttpResponse.java 2001/07/13 00:51:46 1.4
+++ ApplicationHttpResponse.java 2001/07/16 22:24:32 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpResponse.java,v
1.4 2001/07/13 00:51:46 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 2001/07/13 00:51:46 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationHttpResponse.java,v
1.5 2001/07/16 22:24:32 craigmcc Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/07/16 22:24:32 $
*
* ====================================================================
*
@@ -87,7 +87,7 @@
* keep these two classes in synchronization when making changes!
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2001/07/13 00:51:46 $
+ * @version $Revision: 1.5 $ $Date: 2001/07/16 22:24:32 $
*/
class ApplicationHttpResponse extends HttpServletResponseWrapper {
@@ -114,18 +114,12 @@
* @param response The servlet response being wrapped
* @param included <code>true</code> if this response is being processed
* by a <code>RequestDispatcher.include()</code> call
- *
- * @exception IllegalArgumentException if a parent Response implementation
- * cannot be identified
*/
public ApplicationHttpResponse(HttpServletResponse response,
boolean included) {
super(response);
setIncluded(included);
- /*
- calculateParent();
- */
}
@@ -148,14 +142,6 @@
/**
- * The parent object that is actually an internal response object.
- */
- /*
- protected HttpServletResponse parent = null;
- */
-
-
- /**
* The string manager for this package.
*/
protected static StringManager sm =
@@ -393,55 +379,6 @@
/**
- * Calculate and set the parent of the wrapped servlet response that is
- * actually an internal <code>Response</code> implementation.
- *
- * @exception IllegalArgumentException if a parent Response cannot be
- * identified
- */
- /*
- void calculateParent() {
-
- HttpServletResponse response = (HttpServletResponse) getResponse();
- if (response == null) {
- this.parent = null;
- return;
- }
- while (response != null) {
- if ((response instanceof HttpResponse)
- || (response instanceof HttpResponseFacade))
- break;
- if (!(response instanceof HttpServletResponseWrapper)) {
- throw new IllegalArgumentException
- (sm.getString("applicationResponse.badResponse"));
- }
- response = (HttpServletResponse)
- ((HttpServletResponseWrapper) response).getResponse();
- }
- if (response == null) {
- throw new IllegalArgumentException
- (sm.getString("applicationResponse.badParent"));
- }
- this.parent = response;
-
- }
- */
-
-
- /**
- * Get the parent of the wrapped servlet response that is actually an
- * internal Response implementation.
- */
- /*
- HttpServletResponse getParent() {
-
- return (this.parent);
-
- }
- */
-
-
- /**
* Return the included flag for this response.
*/
boolean isIncluded() {
@@ -467,16 +404,10 @@
* Set the response that we are wrapping.
*
* @param response The new wrapped response
- *
- * @exception IllegalArgumentException if a parent Response implementation
- * cannot be identified
*/
void setResponse(HttpServletResponse response) {
- ; // FIXME - cannot change the private "response" variable
- /*
- calculateParent();
- */
+ super.setResponse(response);
}
1.6 +4 -70
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationRequest.java
Index: ApplicationRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationRequest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ApplicationRequest.java 2001/07/13 00:51:47 1.5
+++ ApplicationRequest.java 2001/07/16 22:24:33 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationRequest.java,v
1.5 2001/07/13 00:51:47 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2001/07/13 00:51:47 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationRequest.java,v
1.6 2001/07/16 22:24:33 craigmcc Exp $
+ * $Revision: 1.6 $
+ * $Date: 2001/07/16 22:24:33 $
*
* ====================================================================
*
@@ -90,7 +90,7 @@
* keep these two classes in synchronization when making changes!
*
* @author Craig R. McClanahan
- * @version $Revision: 1.5 $ $Date: 2001/07/13 00:51:47 $
+ * @version $Revision: 1.6 $ $Date: 2001/07/16 22:24:33 $
*/
class ApplicationRequest extends ServletRequestWrapper {
@@ -135,14 +135,6 @@
/**
- * The parent object that is actually an internal request object.
- */
- /*
- protected ServletRequest parent = null;
- */
-
-
- /**
* The string manager for this package.
*/
protected static StringManager sm =
@@ -221,16 +213,10 @@
* Set the request that we are wrapping.
*
* @param request The new wrapped request
- *
- * @exception IllegalArgumentException if a parent Request implementation
- * cannot be identified
*/
public void setRequest(ServletRequest request) {
super.setRequest(request);
- /*
- calculateParent();
- */
// Initialize the attributes for this request
synchronized (attributes) {
@@ -264,58 +250,6 @@
return (false);
}
-
-
- // -------------------------------------------------------- Package Methods
-
-
-
- /**
- * Calculate and set the parent of the wrapped servlet request that is
- * actually an internal <code>Request</code> implementation.
- *
- * @exception IllegalArgumentException if a parent Request cannot be
- * identified
- */
- /*
- void calculateParent() {
-
- ServletRequest request = getRequest();
- if (request == null) {
- this.parent = null;
- return;
- }
- while (request != null) {
- if ((request instanceof Request)
- || (request instanceof RequestFacade))
- break;
- if (!(request instanceof ServletRequestWrapper)) {
- throw new IllegalArgumentException
- (sm.getString("applicationRequest.badRequest"));
- }
- request = ((ServletRequestWrapper) request).getRequest();
- }
- if (request == null) {
- throw new IllegalArgumentException
- (sm.getString("applicationRequest.badParent"));
- }
- this.parent = request;
-
- }
- */
-
-
- /**
- * Get the parent of the wrapped servlet request that is actually an
- * internal Request implementation.
- */
- /*
- ServletRequest getParent() {
-
- return (this.parent);
-
- }
- */
}
1.5 +4 -72
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationResponse.java
Index: ApplicationResponse.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationResponse.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ApplicationResponse.java 2001/07/13 00:51:48 1.4
+++ ApplicationResponse.java 2001/07/16 22:24:33 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationResponse.java,v
1.4 2001/07/13 00:51:48 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 2001/07/13 00:51:48 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationResponse.java,v
1.5 2001/07/16 22:24:33 craigmcc Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/07/16 22:24:33 $
*
* ====================================================================
*
@@ -89,7 +89,7 @@
* keep these two classes in synchronization when making changes!
*
* @author Craig R. McClanahan
- * @version $Revision: 1.4 $ $Date: 2001/07/13 00:51:48 $
+ * @version $Revision: 1.5 $ $Date: 2001/07/16 22:24:33 $
*/
class ApplicationResponse extends ServletResponseWrapper {
@@ -116,17 +116,11 @@
* @param response The servlet response being wrapped
* @param included <code>true</code> if this response is being processed
* by a <code>RequestDispatcher.include()</code> call
- *
- * @exception IllegalArgumentException if a parent Response implementation
- * cannot be identified
*/
public ApplicationResponse(ServletResponse response, boolean included) {
super(response);
setIncluded(included);
- /*
- calculateParent();
- */
}
@@ -142,14 +136,6 @@
/**
- * The parent object that is actually an internal response object.
- */
- /*
- protected ServletResponse parent = null;
- */
-
-
- /**
* The string manager for this package.
*/
protected static StringManager sm =
@@ -207,69 +193,15 @@
* Set the response that we are wrapping.
*
* @param response The new wrapped response
- *
- * @exception IllegalArgumentException if a parent Response implementation
- * cannot be identified
*/
public void setResponse(ServletResponse response) {
super.setResponse(response);
- /*
- calculateParent();
- */
}
// -------------------------------------------------------- Package Methods
-
-
- /**
- * Calculate and set the parent of the wrapped servlet response that is
- * actually an internal <code>Response</code> implementation.
- *
- * @exception IllegalArgumentException if a parent Response cannot be
- * identified
- */
- /*
- void calculateParent() {
-
- ServletResponse response = getResponse();
- if (response == null) {
- this.parent = null;
- return;
- }
- while (response != null) {
- if ((response instanceof Response)
- || (response instanceof ResponseFacade))
- break;
- if (!(response instanceof ServletResponseWrapper)) {
- throw new IllegalArgumentException
- (sm.getString("applicationResponse.badResponse"));
- }
- response = ((ServletResponseWrapper) response).getResponse();
- }
- if (response == null) {
- throw new IllegalArgumentException
- (sm.getString("applicationResponse.badParent"));
- }
- this.parent = response;
-
- }
- */
-
-
- /**
- * Get the parent of the wrapped servlet response that is actually an
- * internal Response implementation.
- */
- /*
- ServletResponse getParent() {
-
- return (this.parent);
-
- }
- */
/**
