tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@locus.apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/service/connector Ajp12ConnectionHandler.java
Date Thu, 06 Apr 2000 23:11:36 GMT
jluc        00/04/06 16:11:36

  Modified:    src/share/org/apache/tomcat/service/connector
                        Ajp12ConnectionHandler.java
  Log:
  bug fix. prevents exceptions with ajpv12 "pings".
  This happened only in "automatic" startup, which is not the default.
  
  Submitted by:	Jun Inamori j-office@osa.att.ne.jp
  
  Revision  Changes    Path
  1.21      +5 -0      jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Ajp12ConnectionHandler.java
  
  Index: Ajp12ConnectionHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Ajp12ConnectionHandler.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Ajp12ConnectionHandler.java	2000/03/31 21:56:50	1.20
  +++ Ajp12ConnectionHandler.java	2000/04/06 23:11:36	1.21
  @@ -132,6 +132,8 @@
   	    resA.setRequest(reqA);
   
   	    reqA.readNextRequest();
  +	    if( reqA.isPing )
  +		return;
   	    if( reqA.shutdown )
   		return;
   	    if (resA.getStatus() >= 400) {
  @@ -171,6 +173,7 @@
       Ajpv12InputStream ajpin;
       ContextManager contextM;
       boolean shutdown=false;
  +    boolean isPing=false;
       boolean doLog;
   
       public int doRead() throws IOException {
  @@ -346,6 +349,8 @@
   			} catch (IOException ignored) {
   			    System.err.println(ignored);
   			}
  +                        isPing = true;
  +                        return;
   		    } else {
   			try {
   			    // close the socket connection before handling any signal
  
  
  

Mime
View raw message