cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net AprEndpoint.java

[mturk]

mturk       2005/06/13 23:55:20

  Modified:    util/java/org/apache/tomcat/util/net AprEndpoint.java
  Log:
  Use the same locking object for add and maintain.
  Also make sure that sockets in the add queue are
  closed on destroy.
  
  Revision  Changes    Path
  1.42      +5 -1      
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
  
  Index: AprEndpoint.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- AprEndpoint.java  10 Jun 2005 14:36:18 -0000      1.41
  +++ AprEndpoint.java  14 Jun 2005 06:55:20 -0000      1.42
  @@ -796,6 +796,10 @@
            * Destroy the poller.
            */
           protected void destroy() {
  +            /* Remove the sockets in the add queue */
  +            for (int i = 0; i < addCount; i--) {
  +                Pool.destroy(addP[i]);
  +            }
               Pool.destroy(pool);
           }
   
  @@ -899,7 +903,7 @@
                           }
                       }
                       if (rv == 0 || maintainTime > 1000000L) {
  -                        synchronized (this) {
  +                        synchronized (addS) {
                               rv = Poll.maintain(serverPollset, desc, true);
                               maintainTime = 0;
                           }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]