tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4 Ajp13Processor.java Ajp13Response.java
Date Fri, 07 Jun 2002 18:54:22 GMT
costin      2002/06/07 11:54:22

  Modified:    jk/java/org/apache/ajp/tomcat4 Ajp13Processor.java
                        Ajp13Response.java
  Log:
  Possible workaround/fix for the deadlock reported by Jean-Francois Nadeau.
  
  It seems on JDK1.4 some strange nio error happens. Can't reproduce it,
  but I'll trust his stacktrace :-)
  
  Revision  Changes    Path
  1.9       +5 -5      jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Processor.java
  
  Index: Ajp13Processor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Processor.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Ajp13Processor.java	20 Feb 2002 16:12:42 -0000	1.8
  +++ Ajp13Processor.java	7 Jun 2002 18:54:21 -0000	1.9
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Processor.java,v
1.8 2002/02/20 16:12:42 seguin Exp $
  - * $Revision: 1.8 $
  - * $Date: 2002/02/20 16:12:42 $
  + * $Header: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Processor.java,v
1.9 2002/06/07 18:54:21 costin Exp $
  + * $Revision: 1.9 $
  + * $Date: 2002/06/07 18:54:21 $
    *
    * ====================================================================
    *
  @@ -102,7 +102,7 @@
   
   /**
    * @author Kevin Seguin
  - * @version $Revision: 1.8 $ $Date: 2002/02/20 16:12:42 $
  + * @version $Revision: 1.9 $ $Date: 2002/06/07 18:54:21 $
    */
   
   final class Ajp13Processor
  @@ -468,7 +468,7 @@
                       logger.log("finished handling request.");
                   }
   
  -            } catch (Exception e) {
  +            } catch (Throwable e) {
                   logger.log("process: invoke", e);
               }
   
  
  
  
  1.4       +5 -1      jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Response.java
  
  Index: Ajp13Response.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/ajp/tomcat4/Ajp13Response.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Ajp13Response.java	17 May 2001 23:55:33 -0000	1.3
  +++ Ajp13Response.java	7 Jun 2002 18:54:22 -0000	1.4
  @@ -187,7 +187,11 @@
   
       public void finishResponse() throws IOException {
   	if(!this.finished) {
  -	    super.finishResponse();
  +            try {
  +                super.finishResponse();
  +            } catch( Throwable t ) {
  +                t.printStackTrace();
  +            }
               this.finished = true; // Avoid END_OF_RESPONSE sent 2 times
   	    ajp13.finish();
   	}        
  
  
  

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


Mime
View raw message