tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardContext.java
Date Fri, 15 Feb 2002 00:03:28 GMT
remm        02/02/14 16:03:28

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardContext.java
  Log:
  - Clean the start and stop methods of context.
  - I think it's not doable to take advantage of the inheritance from ContainerBase
    for these two methods, as the StandardContext must take care of the context class laoder
    binding (and putting it at the end of Loader.start was a hack), so it's necessary to
    interleave method calls.
  - The shutdown order is also modified, and the manager can now notify
    the session listeners if needed.
  - Note: I've tested with the tester.
  
  Revision  Changes    Path
  1.96      +123 -12   jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/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	14 Feb 2002 19:54:12 -0000	1.95
  +++ StandardContext.java	15 Feb 2002 00:03:28 -0000	1.96
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.95 2002/02/14 19:54:12 remm Exp $
  - * $Revision: 1.95 $
  - * $Date: 2002/02/14 19:54:12 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.96 2002/02/15 00:03:28 remm Exp $
  + * $Revision: 1.96 $
  + * $Date: 2002/02/15 00:03:28 $
    *
    * ====================================================================
    *
  @@ -114,6 +114,7 @@
   import org.apache.catalina.LifecycleException;
   import org.apache.catalina.LifecycleListener;
   import org.apache.catalina.Loader;
  +import org.apache.catalina.Mapper;
   import org.apache.catalina.Request;
   import org.apache.catalina.Response;
   import org.apache.catalina.Wrapper;
  @@ -145,7 +146,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.95 $ $Date: 2002/02/14 19:54:12 $
  + * @version $Revision: 1.96 $ $Date: 2002/02/15 00:03:28 $
    */
   
   public class StandardContext
  @@ -2394,9 +2395,8 @@
           if (context != null)
               context.clearAttributes();
   
  -        // Shut down filters and application event listeners
  +        // Shut down filters
           filterStop();
  -        listenerStop();
   
           // Shut down our session manager
           if ((manager != null) && (manager instanceof Lifecycle)) {
  @@ -2407,6 +2407,9 @@
               }
           }
   
  +        // Shut down application event listeners
  +        listenerStop();
  +
           if (isUseNaming()) {
               // Start
               namingContextListener.lifecycleEvent
  @@ -3302,6 +3305,10 @@
        */
       public synchronized void start() throws LifecycleException {
   
  +        if (started)
  +            throw new LifecycleException
  +                (sm.getString("containerBase.alreadyStarted", logName()));
  +
           if (debug >= 1)
               log("Starting");
           if (debug >= 1)
  @@ -3370,13 +3377,62 @@
           // Standard container startup
           if (debug >= 1)
               log("Processing standard container startup");
  +
           if (ok) {
  +
               try {
  -                super.start();
  +
  +                addDefaultMapper(this.mapperClass);
  +                started = true;
  +
  +                // Start our subordinate components, if any
  +                if ((loader != null) && (loader instanceof Lifecycle))
  +                    ((Lifecycle) loader).start();
  +                if ((logger != null) && (logger instanceof Lifecycle))
  +                    ((Lifecycle) logger).start();
  +
  +                // Unbinding thread
  +                unbindThread(oldCCL);
  +
  +                // Binding thread
  +                oldCCL = bindThread();
  +
  +                if ((manager != null) && (manager instanceof Lifecycle))
  +                    ((Lifecycle) manager).start();
  +                if ((cluster != null) && (cluster instanceof Lifecycle))
  +                    ((Lifecycle) cluster).start();
  +                if ((realm != null) && (realm instanceof Lifecycle))
  +                    ((Lifecycle) realm).start();
  +                if ((resources != null) && (resources instanceof Lifecycle))
  +                    ((Lifecycle) resources).start();
  +
  +                // Start our Mappers, if any
  +                Mapper mappers[] = findMappers();
  +                for (int i = 0; i < mappers.length; i++) {
  +                    if (mappers[i] instanceof Lifecycle)
  +                        ((Lifecycle) mappers[i]).start();
  +                }
  +
  +                // Start our child containers, if any
  +                Container children[] = findChildren();
  +                for (int i = 0; i < children.length; i++) {
  +                    if (children[i] instanceof Lifecycle)
  +                        ((Lifecycle) children[i]).start();
  +                }
  +
  +                // Start the Valves in our pipeline (including the basic), 
  +                // if any
  +                if (pipeline instanceof Lifecycle)
  +                    ((Lifecycle) pipeline).start();
  +
  +                // Notify our interested LifecycleListeners
  +                lifecycle.fireLifecycleEvent(START_EVENT, null);
  +
               } finally {
                   // Unbinding thread
                   unbindThread(oldCCL);
               }
  +
           }
           if (!getConfigured())
               ok = false;
  @@ -3438,6 +3494,11 @@
        */
       public synchronized void stop() throws LifecycleException {
   
  +        // Validate and update our current component state
  +        if (!started)
  +            throw new LifecycleException
  +                (sm.getString("containerBase.notStarted", logName()));
  +
           if (debug >= 1)
               log("Stopping");
   
  @@ -3447,9 +3508,8 @@
           // Binding thread
           ClassLoader oldCCL = bindThread();
   
  -        // Stop our filters and application listeners
  +        // Stop our filters
           filterStop();
  -        listenerStop();
   
           // Finalize our character set mapper
           setCharsetMapper(null);
  @@ -3457,10 +3517,61 @@
           // Normal container shutdown processing
           if (debug >= 1)
               log("Processing standard container shutdown");
  -        super.stop();
  +        // Notify our interested LifecycleListeners
  +        lifecycle.fireLifecycleEvent(STOP_EVENT, null);
  +        started = false;
   
  -        // Unbinding thread
  -        unbindThread(oldCCL);
  +        try {
  +
  +            // Stop the Valves in our pipeline (including the basic), if any
  +            if (pipeline instanceof Lifecycle) {
  +                ((Lifecycle) pipeline).stop();
  +            }
  +
  +            // Stop our child containers, if any
  +            Container children[] = findChildren();
  +            for (int i = 0; i < children.length; i++) {
  +                if (children[i] instanceof Lifecycle)
  +                    ((Lifecycle) children[i]).stop();
  +            }
  +
  +            // Stop our Mappers, if any
  +            Mapper mappers[] = findMappers();
  +            for (int i = 0; i < mappers.length; i++) {
  +                if (mappers[(mappers.length-1)-i] instanceof Lifecycle)
  +                    ((Lifecycle) mappers[(mappers.length-1)-i]).stop();
  +            }
  +
  +            // Stop our subordinate components, if any
  +            if ((resources != null) && (resources instanceof Lifecycle)) {
  +                ((Lifecycle) resources).stop();
  +            }
  +            if ((realm != null) && (realm instanceof Lifecycle)) {
  +                ((Lifecycle) realm).stop();
  +            }
  +            if ((cluster != null) && (cluster instanceof Lifecycle)) {
  +                ((Lifecycle) cluster).stop();
  +            }
  +            if ((manager != null) && (manager instanceof Lifecycle)) {
  +                ((Lifecycle) manager).stop();
  +            }
  +
  +            // Stop our application listeners
  +            listenerStop();
  +
  +            if ((logger != null) && (logger instanceof Lifecycle)) {
  +                ((Lifecycle) logger).stop();
  +            }
  +            if ((loader != null) && (loader instanceof Lifecycle)) {
  +                ((Lifecycle) loader).stop();
  +            }
  +
  +        } finally {
  +
  +            // Unbinding thread
  +            unbindThread(oldCCL);
  +
  +        }
   
           if (debug >= 1)
               log("Stopping complete");
  
  
  

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