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

[mmanders]

mmanders    01/08/22 09:58:29

  Modified:    src/share/org/apache/tomcat/util/net PoolTcpEndpoint.java
  Log:
  Added code to handle shutdown a little cleaner by setting soLinger to a small value 
(0) just before we close the socket, and just logging any exceptions instead of doing 
a stacktrace to the console.  This helps make sure that the connections shutdown 
cleanly on NetWare.
  
  Revision  Changes    Path
  1.14      +7 -4      
jakarta-tomcat/src/share/org/apache/tomcat/util/net/PoolTcpEndpoint.java
  
  Index: PoolTcpEndpoint.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- PoolTcpEndpoint.java      2001/08/12 03:57:52     1.13
  +++ PoolTcpEndpoint.java      2001/08/22 16:58:29     1.14
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v 
1.13 2001/08/12 03:57:52 costin Exp $
  - * $Revision: 1.13 $
  - * $Date: 2001/08/12 03:57:52 $
  + * $Header: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v 
1.14 2001/08/22 16:58:29 mmanders Exp $
  + * $Revision: 1.14 $
  + * $Date: 2001/08/22 16:58:29 $
    *
    * ====================================================================
    *
  @@ -291,12 +291,15 @@
                    s=new Socket("127.0.0.1", port );
                }else{
                    s=new Socket(inet, port );
  +                    // setting soLinger to a small value will help shutdown the
  +                    // connection quicker
  +                    s.setSoLinger(true, 0);
                }
                s.close();
                //              System.out.println("Closing socket " + port );
                serverSocket.close(); // XXX?
            } catch(Exception e) {
  -             e.printStackTrace();
  +                log("Caught exception trying to unlock accept.", e);
            }
            serverSocket = null;
        }