[jbossweb-commits] JBossWeb SVN: r1324 - trunk/java/org/apache/catalina/core.

Author: remy.maucherat(a)jboss.com Date: 2009-12-08 13:29:07 -0500 (Tue, 08 Dec 2009) New Revision: 1324 Modified: trunk/java/org/apache/catalina/core/StandardContext.java Log: - During init, it is necessary to default to the list of yet to be sorted listeners. Modified: trunk/java/org/apache/catalina/core/StandardContext.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardContext.java 2009-12-08 15:42:37 UTC (rev 1323) +++ trunk/java/org/apache/catalina/core/StandardContext.java 2009-12-08 18:29:07 UTC (rev 1324) @@ -954,7 +954,8 @@ * this application has started, or after it has been stopped */ public Object[] getApplicationEventListeners() { - return (applicationEventListenersInstances); + return (applicationEventListenersInstances != null + ? applicationEventListenersInstances : listenersInstances); } @@ -979,7 +980,8 @@ * this application has started, or after it has been stopped */ public Object[] getApplicationSessionLifecycleListeners() { - return (applicationSessionLifecycleListenersInstances); + return (applicationSessionLifecycleListenersInstances != null + ? applicationSessionLifecycleListenersInstances : listenersInstances); }