Author: jfrederic.clere(a)jboss.com Date: 2008-06-20 09:36:44 -0400 (Fri, 20 Jun 2008) New Revision: 679 Modified: trunk/java/org/apache/catalina/startup/Embedded.java Log: AprLifecycleListener needs INIT_EVENT and AFTER_STOP_EVENT. Modified: trunk/java/org/apache/catalina/startup/Embedded.java =================================================================== --- trunk/java/org/apache/catalina/startup/Embedded.java 2008-06-20 11:25:23 UTC (rev 678) +++ trunk/java/org/apache/catalina/startup/Embedded.java 2008-06-20 13:36:44 UTC (rev 679) @@ -810,13 +810,18 @@ // Initialize some naming specific properties initNaming(); + // Initialise if not already done. + if (!initialized) { + initialized = true; + lifecycle.fireLifecycleEvent(INIT_EVENT, null); + } + // Validate and update our current component state if (started) throw new LifecycleException (sm.getString("embedded.alreadyStarted")); lifecycle.fireLifecycleEvent(START_EVENT, null); started = true; - initialized = true; // Start our defined Engines first for (int i = 0; i < engines.length; i++) { @@ -865,6 +870,10 @@ if (engines[i] instanceof Lifecycle) ((Lifecycle) engines[i]).stop(); } + if (initialized) { + initialized = false; + lifecycle.fireLifecycleEvent(AFTER_STOP_EVENT, null); + } }