Rename to avoid naming overlap in StandardContext

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1703815 13f79535-47bb-0310-9956-ffa450edef68
apache · Sep 18, 2015 · a66172c · a66172c
1 parent cf92426
commit a66172c
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/java/org/apache/catalina/util/LifecycleBase.java b/java/org/apache/catalina/util/LifecycleBase.java
@@ -46,7 +46,7 @@ public abstract class LifecycleBase implements Lifecycle {
     /**
      * The list of registered LifecycleListeners for event notifications.
      */
-    private final List<LifecycleListener> listeners = new CopyOnWriteArrayList<>();
+    private final List<LifecycleListener> lifecycleListeners = new CopyOnWriteArrayList<>();
 
 
     /**
@@ -60,7 +60,7 @@ public abstract class LifecycleBase implements Lifecycle {
      */
     @Override
     public void addLifecycleListener(LifecycleListener listener) {
-        listeners.add(listener);
+        lifecycleListeners.add(listener);
     }
 
 
@@ -69,7 +69,7 @@ public void addLifecycleListener(LifecycleListener listener) {
      */
     @Override
     public LifecycleListener[] findLifecycleListeners() {
-        return listeners.toArray(new LifecycleListener[0]);
+        return lifecycleListeners.toArray(new LifecycleListener[0]);
     }
 
 
@@ -78,7 +78,7 @@ public LifecycleListener[] findLifecycleListeners() {
      */
     @Override
     public void removeLifecycleListener(LifecycleListener listener) {
-        listeners.remove(listener);
+        lifecycleListeners.remove(listener);
     }
 
 
@@ -90,7 +90,7 @@ public void removeLifecycleListener(LifecycleListener listener) {
      */
     protected void fireLifecycleEvent(String type, Object data) {
         LifecycleEvent event = new LifecycleEvent(this, type, data);
-        for (LifecycleListener listener : listeners) {
+        for (LifecycleListener listener : lifecycleListeners) {
             listener.lifecycleEvent(event);
         }
     }