remm 02/02/02 10:58:05
Modified: catalina/src/share/org/apache/catalina/connector/http
HttpConnector.java
Log:
- Make the log with accept sound a bit worse (it's an unexpected error, after all).
- The recylcle method should sync on processors IMO. This could be the
cause for 5735. Unfortunately, my ab on Cygwin isn't able to generate a very
high concurrency level, so I can't test it.
- Craig, do you think that change is a good idea ?
- Note: If it turns out this fixes problems, the change will need to be ported to all
connectors based on the thread pool.
Revision Changes Path
1.32 +8 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java
Index: HttpConnector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- HttpConnector.java 31 Jan 2002 23:13:26 -0000 1.31
+++ HttpConnector.java 2 Feb 2002 18:58:05 -0000 1.32
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java,v
1.31 2002/01/31 23:13:26 craigmcc Exp $
- * $Revision: 1.31 $
- * $Date: 2002/01/31 23:13:26 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java,v
1.32 2002/02/02 18:58:05 remm Exp $
+ * $Revision: 1.32 $
+ * $Date: 2002/02/02 18:58:05 $
*
* ====================================================================
*
@@ -103,7 +103,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.31 $ $Date: 2002/01/31 23:13:26 $
+ * @version $Revision: 1.32 $ $Date: 2002/02/02 18:58:05 $
*/
@@ -839,7 +839,9 @@
// if (debug >= 2)
// log("recycle: Recycling processor " + processor);
- processors.push(processor);
+ synchronized (processors) {
+ processors.push(processor);
+ }
}
@@ -1035,7 +1037,7 @@
// If reopening fails, exit
synchronized (threadSync) {
if (started && !stopped)
- log("accept: ", e);
+ log("accept error: ", e);
if (!stopped) {
// if (debug >= 3)
// log("run: Closing server
socket");
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
