You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@locus.apache.org on 2000/04/19 01:16:14 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/servlets InvokerServlet.java
costin 00/04/18 16:16:14
Modified: src/share/org/apache/tomcat/core ContextManager.java
RequestDispatcherImpl.java ServletWrapper.java
src/share/org/apache/tomcat/servlets InvokerServlet.java
Log:
Uniform interface between internal components - use Request and Response
as parameters to handleRequest instead of facades.
That will also help with Facade/internal isolation.
Revision Changes Path
1.72 +1 -1 jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java
Index: ContextManager.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- ContextManager.java 2000/04/18 23:04:28 1.71
+++ ContextManager.java 2000/04/18 23:16:13 1.72
@@ -728,7 +728,7 @@
} else {
if( ctx.getDebug() > 0 ) ctx.log( "Error: Calling servlet " + errorServlet );
req.setAttribute("tomcat.servlet.error.handler", errorServlet);
- errorServlet.handleRequest(req.getFacade(),res.getFacade());
+ errorServlet.handleRequest(req,res);
// will call this if any error happens
}
1.22 +6 -6 jakarta-tomcat/src/share/org/apache/tomcat/core/RequestDispatcherImpl.java
Index: RequestDispatcherImpl.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/RequestDispatcherImpl.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- RequestDispatcherImpl.java 2000/04/03 19:33:55 1.21
+++ RequestDispatcherImpl.java 2000/04/18 23:16:13 1.22
@@ -293,10 +293,9 @@
// We got here if name!=null, so assert it
ServletWrapper wrapper = context.getServletByName( name );
-
- wrapper.handleRequest( (HttpServletRequestFacade)request,
- (HttpServletResponseFacade)response);
-
+ Request realR=((HttpServletRequestFacade)request).getRealRequest();
+
+ wrapper.handleRequest( realR, realR.getResponse());
}
/** Named forward
@@ -305,8 +304,9 @@
throws ServletException, IOException
{
ServletWrapper wrapper = context.getServletByName( name );
- wrapper.handleRequest( (HttpServletRequestFacade)request,
- (HttpServletResponseFacade)response);
+ Request realR=((HttpServletRequestFacade)request).getRealRequest();
+
+ wrapper.handleRequest( realR, realR.getResponse());
}
/**
1.41 +3 -14 jakarta-tomcat/src/share/org/apache/tomcat/core/ServletWrapper.java
Index: ServletWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ServletWrapper.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ServletWrapper.java 2000/04/18 23:04:31 1.40
+++ ServletWrapper.java 2000/04/18 23:16:13 1.41
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ServletWrapper.java,v 1.40 2000/04/18 23:04:31 costin Exp $
- * $Revision: 1.40 $
- * $Date: 2000/04/18 23:04:31 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ServletWrapper.java,v 1.41 2000/04/18 23:16:13 costin Exp $
+ * $Revision: 1.41 $
+ * $Date: 2000/04/18 23:16:13 $
*
* ====================================================================
*
@@ -516,17 +516,6 @@
}
}
}
-
- /** @deprecated
- */
- public void handleRequest(final HttpServletRequestFacade request,
- final HttpServletResponseFacade response)
- {
- Request rrequest=request.getRealRequest();
- Response rresponse=rrequest.getResponse();
- handleRequest( rrequest, rresponse );
- }
-
public String toString() {
String toS="Wrapper(" + config.getServletName() + " ";
1.8 +1 -1 jakarta-tomcat/src/share/org/apache/tomcat/servlets/InvokerServlet.java
Index: InvokerServlet.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/servlets/InvokerServlet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- InvokerServlet.java 2000/03/23 23:34:36 1.7
+++ InvokerServlet.java 2000/04/18 23:16:14 1.8
@@ -254,7 +254,7 @@
}
}
- wrapper.handleRequest(requestfacade, responsefacade);
+ wrapper.handleRequest(realRequest, realResponse);
if (!inInclude) {
realRequest.setServletPath( savedServletPath);