hgomez      2002/11/21 01:32:17

  Modified:    jk/java/org/apache/jk/common ChannelSocket.java
  Log:
  Report timeout exception as such
  
  Revision  Changes    Path
  1.27      +7 -7      
jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java
  
  Index: ChannelSocket.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/common/ChannelSocket.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- ChannelSocket.java        20 Nov 2002 14:16:46 -0000      1.26
  +++ ChannelSocket.java        21 Nov 2002 09:32:17 -0000      1.27
  @@ -555,14 +555,14 @@
                   }
               }
           } catch( Exception ex ) {
  -            if( ex.getMessage().indexOf( "Connection reset" ) >=0 ||
  -                ex.getMessage().indexOf( "Read timed out" ) >=0 ) 
  +            if( ex.getMessage().indexOf( "Connection reset" ) >= 0)
                   log.info( "Server has been restarted or reset this connection");
  +            else if (ex.getMessage().indexOf( "Read timed out" ) >=0 )
  +                log.info( "connection timeout reached");            
               else
                   log.error( "Error, processing connection", ex);
           }
  -         finally {
  -             
  +        finally {
                /*
                 * Whatever happened to this connection (remote closed it, timeout, 
read error)
                 * the socket SHOULD be closed, or we may be in situation where the 
webserver
  @@ -572,10 +572,10 @@
               try {
                   this.close( ep );
               }
  -            catch( Exception ex) {
  -                log.error( "Error, closing connection", ex);
  +            catch( Exception e) {
  +                log.error( "Error, closing connection", e);
               }
  -         }
  +        }
       }
   
       public int invoke( Msg msg, MsgContext ep ) throws IOException {
  
  
  

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

Reply via email to