Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 48243 invoked by uid 500); 21 Sep 2001 16:38:16 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: tomcat-dev@jakarta.apache.org Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 48231 invoked by uid 500); 21 Sep 2001 16:38:16 -0000 Delivered-To: apmail-jakarta-tomcat-4.0-cvs@apache.org Date: 21 Sep 2001 16:31:29 -0000 Message-ID: <20010921163129.30905.qmail@icarus.apache.org> From: craigmcc@apache.org To: jakarta-tomcat-4.0-cvs@apache.org Subject: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardContext.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N craigmcc 01/09/21 09:31:29 Modified: catalina/src/share/org/apache/catalina/core StandardContext.java Log: Port the proposed fix for #3733. Revision Changes Path 1.79 +13 -13 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.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- StandardContext.java 2001/09/15 23:31:29 1.78 +++ StandardContext.java 2001/09/21 16:31:29 1.79 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v 1.78 2001/09/15 23:31:29 craigmcc Exp $ - * $Revision: 1.78 $ - * $Date: 2001/09/15 23:31:29 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v 1.79 2001/09/21 16:31:29 craigmcc Exp $ + * $Revision: 1.79 $ + * $Date: 2001/09/21 16:31:29 $ * * ==================================================================== * @@ -142,7 +142,7 @@ * * @author Craig R. McClanahan * @author Remy Maucherat - * @version $Revision: 1.78 $ $Date: 2001/09/15 23:31:29 $ + * @version $Revision: 1.79 $ $Date: 2001/09/21 16:31:29 $ */ public class StandardContext @@ -2466,15 +2466,6 @@ // Binding thread oldCCL = bindThread(); - // Restart our session manager (AFTER naming context recreated/bound) - if ((manager != null) && (manager instanceof Lifecycle)) { - try { - ((Lifecycle) manager).start(); - } catch (LifecycleException e) { - log(sm.getString("standardContext.startingManager"), e); - } - } - // Restart our application event listeners and filters if (ok) { if (!listenerStart()) { @@ -2512,6 +2503,15 @@ // Reinitialize all load on startup servlets loadOnStartup(children); + + // Restart our session manager (AFTER naming context recreated/bound) + if ((manager != null) && (manager instanceof Lifecycle)) { + try { + ((Lifecycle) manager).start(); + } catch (LifecycleException e) { + log(sm.getString("standardContext.startingManager"), e); + } + } // Unbinding thread unbindThread(oldCCL);