You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by bo...@apache.org on 2002/08/24 01:01:08 UTC
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardWrapperValve.java ApplicationFilterFactory.java ApplicationDispatcher.java
bobh 2002/08/23 16:01:05
Modified: catalina/src/share/org/apache/catalina/core
StandardWrapperValve.java
ApplicationFilterFactory.java
ApplicationDispatcher.java
Log:
- ApplicationFilterFactory was trying to allocate() it's own copy of a
servlet when its callers already have an instance handy. Changed to
pass in caller's instance. (Was creating a problem with
SingleThreadModel watchdog test.)
- removed Gregory Murray's name from the comments at his request
Revision Changes Path
1.3 +5 -8 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java
Index: StandardWrapperValve.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StandardWrapperValve.java 22 Aug 2002 22:05:51 -0000 1.2
+++ StandardWrapperValve.java 23 Aug 2002 23:01:05 -0000 1.3
@@ -245,11 +245,8 @@
}
// Create the filter chain for this request
- // Modifications by Greg Murray
ApplicationFilterFactory factory = ApplicationFilterFactory.getInstance();
- ApplicationFilterChain filterChain = factory.createFilterChain(sreq, wrapper, ApplicationFilterFactory.REQUEST);
- // Greg Murray Modifcations complete
-
+ ApplicationFilterChain filterChain = factory.createFilterChain(sreq, wrapper, servlet, ApplicationFilterFactory.REQUEST);
// Call the filter chain for this request
// NOTE: This also calls the servlet's service() method
1.2 +4 -10 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationFilterFactory.java
Index: ApplicationFilterFactory.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationFilterFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApplicationFilterFactory.java 22 Aug 2002 22:05:51 -0000 1.1
+++ ApplicationFilterFactory.java 23 Aug 2002 23:01:05 -0000 1.2
@@ -122,14 +122,8 @@
* @param servlet The servlet instance to be wrapped
*/
public ApplicationFilterChain createFilterChain(ServletRequest request,
- Wrapper wrapper, int dispatcher) {
+ Wrapper wrapper, Servlet servlet, int dispatcher) {
- Servlet servlet = null;
- try {
- servlet = ((StandardWrapper)wrapper).allocate();
- } catch (ServletException se) {
- // FIXME handle this properly here
- }
HttpServletRequest hreq = null;
if (request instanceof HttpServletRequest) hreq = (HttpServletRequest)request;
// If there is no servlet to execute, return null
1.3 +5 -5 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
Index: ApplicationDispatcher.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ApplicationDispatcher.java 22 Aug 2002 22:05:51 -0000 1.2
+++ ApplicationDispatcher.java 23 Aug 2002 23:01:05 -0000 1.3
@@ -669,7 +669,7 @@
}
// Get the FilterChain Here
ApplicationFilterFactory factory = ApplicationFilterFactory.getInstance();
- ApplicationFilterChain filterChain = factory.createFilterChain(request, wrapper, dispatcherMapping);
+ ApplicationFilterChain filterChain = factory.createFilterChain(request, wrapper, servlet, dispatcherMapping);
// Call the service() method for the allocated servlet instance
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>