tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From billbar...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/common ChannelSocket.java
Date Fri, 17 Sep 2004 04:08:53 GMT
billbarker    2004/09/16 21:08:53

  Modified:    jk/java/org/apache/jk/common ChannelSocket.java
  Log:
  Not all exceptions have a message
  
  Revision  Changes    Path
  1.48      +4 -4      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.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- ChannelSocket.java	5 Jun 2004 05:51:30 -0000	1.47
  +++ ChannelSocket.java	17 Sep 2004 04:08:53 -0000	1.48
  @@ -679,14 +679,14 @@
                   }
               }
           } catch( Exception ex ) {
  -            if( ex.getMessage().indexOf( "Connection reset" ) >= 0)
  +            String msg = ex.getMessage();
  +            if( msg != null && msg.indexOf( "Connection reset" ) >= 0)
                   log.debug( "Server has been restarted or reset this connection");
  -            else if (ex.getMessage().indexOf( "Read timed out" ) >=0 )
  +            else if (msg != null && msg.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
  
  
  

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


Mime
View raw message