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/jk/server JkCoyoteHandler.java
Date Fri, 09 Aug 2002 17:42:44 GMT
costin      2002/08/09 10:42:44

  Modified:    jk/java/org/apache/jk/server JkCoyoteHandler.java
  Log:
  Move start to the right place.
  
  Now the ajp13 port will be opened at the same time with the http port,
  i.e. at server startup.
  
  Revision  Changes    Path
  1.26      +8 -4      jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java
  
  Index: JkCoyoteHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- JkCoyoteHandler.java	2 Jul 2002 16:57:30 -0000	1.25
  +++ JkCoyoteHandler.java	9 Aug 2002 17:42:44 -0000	1.26
  @@ -63,7 +63,6 @@
   import java.net.*;
   import java.util.*;
   
  -import org.apache.jk.*;
   import org.apache.jk.core.*;
   import org.apache.jk.common.*;
   
  @@ -147,7 +146,6 @@
               // jkMain.setJkHome() XXX;
               
               jkMain.init();
  -            jkMain.start();
   
               headersMsgNote=wEnv.getNoteId( WorkerEnv.ENDPOINT_NOTE, "headerMsg" );
               utfC2bNote=wEnv.getNoteId( WorkerEnv.ENDPOINT_NOTE, "utfC2B" );
  @@ -162,6 +160,11 @@
       }
   
       public void start() {
  +        try {
  +            jkMain.start();
  +        } catch( Exception ex ) {
  +            ex.printStackTrace();
  +        }
       }
   
       public void destroy() {
  @@ -334,7 +337,8 @@
                   org.apache.coyote.Response res=(org.apache.coyote.Response)param;
                   MsgContext ep=(MsgContext)res.getNote( epNote );
                   if( ep.getStatus()== JK_STATUS_CLOSED ) {
  -                    // Double close - it may happen with forward
  +                    // Double close - it may happen with forward 
  +                    if( log.isDebugEnabled() ) log.debug("Double CLOSE - forward ? " +
res.getRequest().requestURI() );
                       return;
                   }
                    
  @@ -361,7 +365,7 @@
                   
               } else if( actionCode==ActionCode.ACTION_REQ_HOST_ATTRIBUTE ) {
   
  -            } else if( actionCode==ActionCode.ACTION_POST_REQUEST ) {
  +            // } else if( actionCode==ActionCode.ACTION_POST_REQUEST ) {
   
               } else if( actionCode==ActionCode.ACTION_ACK ) {
                   if( log.isDebugEnabled() )
  
  
  

--
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