billbarker    02/03/15 19:29:42

  Modified:    coyote/src/java/org/apache/coyote/tomcat3
                        CoyoteInterceptor.java
  Log:
  Make certain that the Processor is started and stopped.
  
  This is to stay in line with recent changes in the Http11Processor.
  
  Revision  Changes    Path
  1.3       +10 -1     
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/CoyoteInterceptor.java
  
  Index: CoyoteInterceptor.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/CoyoteInterceptor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CoyoteInterceptor.java    12 Mar 2002 05:58:26 -0000      1.2
  +++ CoyoteInterceptor.java    16 Mar 2002 03:29:42 -0000      1.3
  @@ -75,6 +75,8 @@
   import org.apache.tomcat.modules.server.PoolTcpConnector;
   import org.apache.coyote.Adapter;
   import org.apache.coyote.Processor;
  +import org.apache.coyote.ActionHook;
  +import org.apache.coyote.ActionCode;
   
   /** Standalone http.
    *
  @@ -160,6 +162,7 @@
            Class processorClass = 
                getClass().getClassLoader().loadClass(processorClassName);
            processor = (Processor)processorClass.newInstance();
  +         processor.setAdapter(adaptor);
        } catch(Exception ex) {
            log("Can't load Processor", ex);
        }
  @@ -177,7 +180,10 @@
        try {
            adaptor=(CoyoteProcessor)thData[0];
            processor=(Processor)thData[1];
  -         processor.setAdapter(adaptor);
  +
  +         if (processor instanceof ActionHook) {
  +             ((ActionHook) processor).action(ActionCode.ACTION_START, null);
  +         }
            socket=connection.getSocket();
            socket.setSoTimeout(timeout);
   
  @@ -221,6 +227,9 @@
            log( "Error reading request, ignored", e, Log.ERROR);
        } finally {
            if(adaptor != null) adaptor.recycle();
  +         if (processor instanceof ActionHook) {
  +             ((ActionHook) processor).action(ActionCode.ACTION_STOP, null);
  +         }
            // recycle kernel sockets ASAP
            try { if (socket != null) socket.close (); }
            catch (IOException e) { /* ignore */ }
  
  
  

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

Reply via email to