Repository: tomee Updated Branches: refs/heads/master cbec77332 -> d9f0e448b
TOMEE-1896 wrong start index when cdi is not activated and we update tomcat listeners Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d9f0e448 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d9f0e448 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d9f0e448 Branch: refs/heads/master Commit: d9f0e448b38b2f881bf890143d3cedd6d47bea7c Parents: cbec773 Author: Romain manni-Bucau <rmannibu...@gmail.com> Authored: Thu Aug 4 15:58:18 2016 +0200 Committer: Romain manni-Bucau <rmannibu...@gmail.com> Committed: Thu Aug 4 15:58:18 2016 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/d9f0e448/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java index 70bb209..4abb4d2 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java @@ -1772,7 +1772,7 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare final Object[] appEventListeners = standardContext.getApplicationEventListeners(); final Object[] newEventListeners = new Object[appEventListeners.length + 1]; - System.arraycopy(appEventListeners, 0, newEventListeners, 1, appEventListeners.length); + System.arraycopy(appEventListeners, 0, newEventListeners, 0, appEventListeners.length); newEventListeners[newEventListeners.length - 1] = endWebBeansListener; standardContext.setApplicationEventListeners(newEventListeners); } @@ -1781,7 +1781,7 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare final Object[] lifecycleListeners = standardContext.getApplicationLifecycleListeners(); final Object[] newLifecycleListeners = new Object[lifecycleListeners.length + 1]; - System.arraycopy(lifecycleListeners, 0, newLifecycleListeners, 1, lifecycleListeners.length); + System.arraycopy(lifecycleListeners, 0, newLifecycleListeners, 0, lifecycleListeners.length); newLifecycleListeners[newLifecycleListeners.length - 1] = endWebBeansListener; standardContext.setApplicationLifecycleListeners(newLifecycleListeners); }