cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10 HttpConnector.java

[remm]

remm        01/07/10 00:37:08

  Modified:    catalina/src/share/org/apache/catalina/connector/http10
                        HttpConnector.java
  Log:
  - Negative value for maxProcessors means unlimited number of processors.
    Bug reported by Kumar Mettu <mettu.kumar at redspark.com>
  
  Revision  Changes    Path
  1.7       +12 -7     
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java
  
  Index: HttpConnector.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- HttpConnector.java        2001/05/09 23:42:14     1.6
  +++ HttpConnector.java        2001/07/10 07:37:05     1.7
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java,v
 1.6 2001/05/09 23:42:14 craigmcc Exp $
  - * $Revision: 1.6 $
  - * $Date: 2001/05/09 23:42:14 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java,v
 1.7 2001/07/10 07:37:05 remm Exp $
  + * $Revision: 1.7 $
  + * $Date: 2001/07/10 07:37:05 $
    *
    * ====================================================================
    *
  @@ -94,7 +94,7 @@
    * purposes.  Not intended to be the final solution.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.6 $ $Date: 2001/05/09 23:42:14 $
  + * @version $Revision: 1.7 $ $Date: 2001/07/10 07:37:05 $
    */
   
   
  @@ -742,10 +742,15 @@
        synchronized (processors) {
            if (processors.size() > 0)
                return ((HttpProcessor) processors.pop());
  -         if ((maxProcessors > 0) && (curProcessors < maxProcessors))
  +         if ((maxProcessors > 0) && (curProcessors < maxProcessors)) {
                return (newProcessor());
  -         else
  -             return (null);
  +         } else {
  +                if (maxProcessors < 0) {
  +                    return (newProcessor());
  +                } else {
  +                    return (null);
  +                }
  +            }
        }
   
       }