Author: markt Date: Fri Sep 18 12:04:39 2015 New Revision: 1703815 URL: http://svn.apache.org/viewvc?rev=1703815&view=rev Log: Rename to avoid naming overlap in StandardContext
Modified: tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java Modified: tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java?rev=1703815&r1=1703814&r2=1703815&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java Fri Sep 18 12:04:39 2015 @@ -46,7 +46,7 @@ public abstract class LifecycleBase impl /** * 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 impl */ @Override public void addLifecycleListener(LifecycleListener listener) { - listeners.add(listener); + lifecycleListeners.add(listener); } @@ -69,7 +69,7 @@ public abstract class LifecycleBase impl */ @Override public LifecycleListener[] findLifecycleListeners() { - return listeners.toArray(new LifecycleListener[0]); + return lifecycleListeners.toArray(new LifecycleListener[0]); } @@ -78,7 +78,7 @@ public abstract class LifecycleBase impl */ @Override public void removeLifecycleListener(LifecycleListener listener) { - listeners.remove(listener); + lifecycleListeners.remove(listener); } @@ -90,7 +90,7 @@ public abstract class LifecycleBase impl */ 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); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org