luehe       2003/10/15 10:24:16

  Modified:    catalina/src/share/org/apache/catalina/core
                        ContainerBase.java StandardContext.java
  Log:
  Start/stop ContainerBackgroundProcessor thread as part of 
StandardContext.start()/stop(), respectively.
  
  Revision  Changes    Path
  1.29      +3 -3      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java
  
  Index: ContainerBase.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- ContainerBase.java        2 Sep 2003 21:22:04 -0000       1.28
  +++ ContainerBase.java        15 Oct 2003 17:24:16 -0000      1.29
  @@ -1158,7 +1158,7 @@
           // Notify our interested LifecycleListeners
           lifecycle.fireLifecycleEvent(BEFORE_STOP_EVENT, null);
   
  -        // Stop out thread
  +        // Stop our thread
           threadStop();
   
           // Notify our interested LifecycleListeners
  @@ -1583,7 +1583,7 @@
        * Start the background thread that will periodically check for
        * session timeouts.
        */
  -    private void threadStart() {
  +    protected void threadStart() {
   
           if (thread != null)
               return;
  @@ -1603,7 +1603,7 @@
        * Stop the background thread that is periodically checking for
        * session timeouts.
        */
  -    private void threadStop() {
  +    protected void threadStop() {
   
           if (thread == null)
               return;
  
  
  
  1.96      +7 -1      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.95
  retrieving revision 1.96
  diff -u -r1.95 -r1.96
  --- StandardContext.java      23 Sep 2003 09:07:37 -0000      1.95
  +++ StandardContext.java      15 Oct 2003 17:24:16 -0000      1.96
  @@ -4107,6 +4107,9 @@
                       ((Lifecycle) getManager()).start();
                   }
   
  +                // Start ContainerBackgroundProcessor thread
  +                super.threadStart();
  +
               } finally {
                   // Unbinding thread
                   unbindThread(oldCCL);
  @@ -4294,6 +4297,9 @@
   
           // Finalize our character set mapper
           setCharsetMapper(null);
  +
  +        // Stop ContainerBackgroundProcessor thread
  +        super.threadStop();
   
           if ((manager != null) && (manager instanceof Lifecycle)) {
               ((Lifecycle) manager).stop();
  
  
  

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

Reply via email to