tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardWrapper.java
Date Thu, 13 Jun 2002 16:27:24 GMT
remm        2002/06/13 09:27:24

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardWrapper.java
  Log:
  - Do not wait forever if a servlet doesn't want to shut itself down.
  - Now the wait is 10 * 50ms.
  - Fixes bug 8935, and probably a few others.
  
  Revision  Changes    Path
  1.38      +9 -9      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
  
  Index: StandardWrapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- StandardWrapper.java	20 Feb 2002 07:09:24 -0000	1.37
  +++ StandardWrapper.java	13 Jun 2002 16:27:23 -0000	1.38
  @@ -1064,18 +1064,18 @@
           // Loaf a while if the current instance is allocated
           // (possibly more than once if non-STM)
           if (countAllocated > 0) {
  -            boolean first = true;
  -            while (countAllocated > 0) {
  -                if (first) {
  +            int nRetries = 0;
  +            while (nRetries < 10) {
  +                if (nRetries == 0) {
                       log("Waiting for " + countAllocated +
                           " instance(s) to be deallocated");
  -                    first = false;
                   }
                   try {
  -                    Thread.sleep(1000);
  +                    Thread.sleep(50);
                   } catch (InterruptedException e) {
                       ;
                   }
  +                nRetries++;
               }
           }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message