From e66558f63961c10fb13c6ae387c0ddc51f01005a Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 17 Feb 2010 09:38:07 +0000
Subject: [PATCH] More lifecycle clean-up

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@910883 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/core/ContainerBase.java             | 2 +-
 java/org/apache/catalina/core/StandardServer.java            | 6 ++----
 java/org/apache/catalina/core/StandardService.java           | 5 ++---
 java/org/apache/catalina/mbeans/ServerLifecycleListener.java | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/core/ContainerBase.java b/java/org/apache/catalina/core/ContainerBase.java
index 7a65d0967..a433c0f51 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -123,7 +123,7 @@ import org.apache.tomcat.util.modeler.Registry;
  */
 
 public abstract class ContainerBase
-    implements Container, Lifecycle, MBeanRegistration {
+    implements Container, MBeanRegistration {
 
     private static final org.apache.juli.logging.Log log=
         org.apache.juli.logging.LogFactory.getLog( ContainerBase.class );
diff --git a/java/org/apache/catalina/core/StandardServer.java b/java/org/apache/catalina/core/StandardServer.java
index fe7fed48d..fb5edf785 100644
--- a/java/org/apache/catalina/core/StandardServer.java
+++ b/java/org/apache/catalina/core/StandardServer.java
@@ -34,7 +34,6 @@ import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 import org.apache.catalina.Context;
-import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.Server;
@@ -57,9 +56,8 @@ import org.apache.tomcat.util.modeler.Registry;
  * @author Craig R. McClanahan
  * @version $Revision$ $Date$
  */
-public final class StandardServer
-    implements Lifecycle, Server, MBeanRegistration 
- {
+public final class StandardServer implements Server, MBeanRegistration {
+
     private static final Log log = LogFactory.getLog(StandardServer.class);
    
 
diff --git a/java/org/apache/catalina/core/StandardService.java b/java/org/apache/catalina/core/StandardService.java
index 102712b66..db8271b16 100644
--- a/java/org/apache/catalina/core/StandardService.java
+++ b/java/org/apache/catalina/core/StandardService.java
@@ -49,9 +49,8 @@ import org.apache.catalina.Executor;
  * @author Craig R. McClanahan
  */
 
-public class StandardService
-        implements Lifecycle, Service, MBeanRegistration 
- {
+public class StandardService implements Service, MBeanRegistration {
+
     private static final Log log = LogFactory.getLog(StandardService.class);
    
 
diff --git a/java/org/apache/catalina/mbeans/ServerLifecycleListener.java b/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
index 09c6c01c9..5cd2b70d1 100644
--- a/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
+++ b/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
@@ -302,7 +302,7 @@ public class ServerLifecycleListener
         context.addContainerListener(this);
         if (context instanceof StandardContext) {
             ((StandardContext) context).addPropertyChangeListener(this);
-            ((StandardContext) context).addLifecycleListener(this);
+            context.addLifecycleListener(this);
         }
 
         // If the context is privileged, give a reference to it
-- 
2.11.0