Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 85904 invoked from network); 1 Aug 2003 06:14:29 -0000 Received: from exchange.sun.com (192.18.33.10) by daedalus.apache.org with SMTP; 1 Aug 2003 06:14:29 -0000 Received: (qmail 27328 invoked by uid 97); 1 Aug 2003 06:17:16 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@nagoya.betaversion.org Received: (qmail 27321 invoked from network); 1 Aug 2003 06:17:15 -0000 Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12) by nagoya.betaversion.org with SMTP; 1 Aug 2003 06:17:15 -0000 Received: (qmail 85086 invoked by uid 500); 1 Aug 2003 06:14:18 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 85071 invoked by uid 500); 1 Aug 2003 06:14:18 -0000 Received: (qmail 85067 invoked from network); 1 Aug 2003 06:14:18 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 1 Aug 2003 06:14:18 -0000 Received: (qmail 64306 invoked by uid 1135); 1 Aug 2003 06:14:40 -0000 Date: 1 Aug 2003 06:14:40 -0000 Message-ID: <20030801061440.64304.qmail@minotaur.apache.org> From: remm@apache.org To: jakarta-tomcat-catalina-cvs@apache.org Subject: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardContext.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N remm 2003/07/31 23:14:40 Modified: catalina/src/share/org/apache/catalina/core StandardContext.java Log: - Remove (for now) dead reload code. Revision Changes Path 1.78 +1 -148 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.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- StandardContext.java 31 Jul 2003 20:56:25 -0000 1.77 +++ StandardContext.java 1 Aug 2003 06:14:40 -0000 1.78 @@ -2744,153 +2744,6 @@ setPaused(false); - if (true) - return; - - // Binding thread - ClassLoader oldCCL = bindThread(); - - // Shut down our session manager - if ((manager != null) && (manager instanceof Lifecycle)) { - try { - ((Lifecycle) manager).stop(); - } catch (LifecycleException e) { - log.error(sm.getString("standardContext.stoppingManager"), e); - } - } - - // Shut down the current version of all active servlets - Container children[] = findChildren(); - for (int i = 0; i < children.length; i++) { - Wrapper wrapper = (Wrapper) children[i]; - if (wrapper instanceof Lifecycle) { - try { - ((Lifecycle) wrapper).stop(); - } catch (LifecycleException e) { - log.error(sm.getString("standardContext.stoppingWrapper", - wrapper.getName()), - e); - } - } - } - - // Shut down application event listeners - listenerStop(); - - // Clear all application-originated servlet context attributes - if (context != null) - context.clearAttributes(); - - // Shut down filters - filterStop(); - - if (isUseNaming()) { - // Start - namingContextListener.lifecycleEvent - (new LifecycleEvent(this, Lifecycle.STOP_EVENT)); - } - - // Binding thread - unbindThread(oldCCL); - - // Shut down our application class loader - if ((loader != null) && (loader instanceof Lifecycle)) { - try { - ((Lifecycle) loader).stop(); - } catch (LifecycleException e) { - log.error(sm.getString("standardContext.stoppingLoader"), e); - } - } - - // Binding thread - oldCCL = bindThread(); - - // Restart our application class loader - if ((loader != null) && (loader instanceof Lifecycle)) { - try { - ((Lifecycle) loader).start(); - } catch (LifecycleException e) { - log.error(sm.getString("standardContext.startingLoader"), e); - } - } - - // Binding thread - unbindThread(oldCCL); - - // Create and register the associated naming context, if internal - // naming is used - boolean ok = true; - if (isUseNaming()) { - // Start - namingContextListener.lifecycleEvent - (new LifecycleEvent(this, Lifecycle.START_EVENT)); - } - - // Binding thread - oldCCL = bindThread(); - - // Restart our application event listeners and filters - if (ok) { - if (!listenerStart()) { - log.error(sm.getString("standardContext.listenerStartFailed")); - ok = false; - } - } - if (ok) { - if (!filterStart()) { - log.error(sm.getString("standardContext.filterStartFailed")); - ok = false; - } - } - - // Restore the "Welcome Files" and "Resources" context attributes - postResources(); - postWelcomeFiles(); - - // Restart our currently defined servlets - for (int i = 0; i < children.length; i++) { - if (!ok) - break; - Wrapper wrapper = (Wrapper) children[i]; - if (wrapper instanceof Lifecycle) { - try { - ((Lifecycle) wrapper).start(); - } catch (LifecycleException e) { - log.error(sm.getString("standardContext.startingWrapper", - wrapper.getName()), - e); - ok = false; - } - } - } - - // 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.error(sm.getString("standardContext.startingManager"), e); - } - } - - // Unbinding thread - unbindThread(oldCCL); - - // Start accepting requests again - if (ok) { - log.info(sm.getString("standardContext.reloadingCompleted")); - } else { - setAvailable(false); - log.error(sm.getString("standardContext.reloadingFailed")); - } - setPaused(false); - - // Notify our interested LifecycleListeners - lifecycle.fireLifecycleEvent(Context.RELOAD_EVENT, null); - } --------------------------------------------------------------------- To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org