craigmcc 01/05/23 15:01:07
Modified: catalina/src/share/org/apache/catalina/core
ApplicationFilterChain.java
Log:
It is not necessary to synchronize the service() call of a
SingleThreadModel servlet, since StandardWrapper.allocate() already
ensured that the instance we have has not been allocated to any other
thread.
Revision Changes Path
1.8 +7 -21
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationFilterChain.java
Index: ApplicationFilterChain.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationFilterChain.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ApplicationFilterChain.java 2001/05/10 18:28:33 1.7
+++ ApplicationFilterChain.java 2001/05/23 22:01:05 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationFilterChain.java,v
1.7 2001/05/10 18:28:33 craigmcc Exp $
- * $Revision: 1.7 $
- * $Date: 2001/05/10 18:28:33 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationFilterChain.java,v
1.8 2001/05/23 22:01:05 craigmcc Exp $
+ * $Revision: 1.8 $
+ * $Date: 2001/05/23 22:01:05 $
*
* ====================================================================
*
@@ -77,7 +77,6 @@
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import javax.servlet.SingleThreadModel;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.InstanceEvent;
@@ -93,7 +92,7 @@
* method itself.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.7 $ $Date: 2001/05/10 18:28:33 $
+ * @version $Revision: 1.8 $ $Date: 2001/05/23 22:01:05 $
*/
final class ApplicationFilterChain implements FilterChain {
@@ -245,23 +244,10 @@
servlet);
if ((request instanceof HttpServletRequest) &&
(response instanceof HttpServletResponse)) {
- if (servlet instanceof SingleThreadModel) {
- synchronized (servlet) {
- servlet.service((HttpServletRequest) request,
- (HttpServletResponse) response);
- }
- } else {
- servlet.service((HttpServletRequest) request,
- (HttpServletResponse) response);
- }
+ servlet.service((HttpServletRequest) request,
+ (HttpServletResponse) response);
} else {
- if (servlet instanceof SingleThreadModel) {
- synchronized (servlet) {
- servlet.service(request, response);
- }
- } else {
- servlet.service(request, response);
- }
+ servlet.service(request, response);
}
support.fireInstanceEvent(InstanceEvent.AFTER_SERVICE_EVENT,
servlet);
