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

[remm]

remm        2004/10/14 01:07:48

  Modified:    util/java/org/apache/tomcat/util/net PoolTcpEndpoint.java
  Log:
  - Remove bad shutdown logic for ms strategy.
  
  Revision  Changes    Path
  1.42      +3 -7      
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java
  
  Index: PoolTcpEndpoint.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- PoolTcpEndpoint.java      5 Oct 2004 22:16:20 -0000       1.41
  +++ PoolTcpEndpoint.java      14 Oct 2004 08:07:48 -0000      1.42
  @@ -342,13 +342,14 @@
           if (running) {
               if (lf) {
                   tp.shutdown();
  -            } else {
  -                threadStop();
               }
               running = false;
               if (serverSocket != null) {
                   closeServerSocket();
               }
  +            if (!lf) {
  +                threadStop();
  +            }
           }
       }
   
  @@ -668,11 +669,6 @@
        * Stop the background processing thread.
        */
       private void threadStop() {
  -        try {
  -            threadSync.wait(5000);
  -        } catch (InterruptedException e) {
  -            ;
  -        }
           thread = null;
       }
   
  
  
  

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