svn commit: r1420570 - /openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

[rmannibucau]

Author: rmannibucau
Date: Wed Dec 12 08:35:58 2012
New Revision: 1420570

URL: http://svn.apache.org/viewvc?rev=1420570&view=rev
Log:
issue with index in the yesterday commit

Modified:
    
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

Modified: 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1420570&r1=1420569&r2=1420570&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 (original)
+++ 
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 Wed Dec 12 08:35:58 2012
@@ -1324,24 +1324,28 @@ public class TomcatWebAppBuilder impleme
             // to be sure to create contexts before other listeners
             // and destroy contexts after other listeners
 
-            final Object[] appEventListeners = 
standardContext.getApplicationEventListeners();
-            final Object[] newEventListeners = new 
Object[appEventListeners.length + 2];
-
-            final Object[] lifecycleListeners = 
standardContext.getApplicationLifecycleListeners();
-            final Object[] newLifecycleListeners = new 
Object[lifecycleListeners.length + 2];
-
             final BeginWebBeansListener beginWebBeansListener = new 
BeginWebBeansListener(webBeansContext);
             final EndWebBeansListener endWebBeansListener = new 
EndWebBeansListener(webBeansContext);
 
-            newEventListeners[0] = beginWebBeansListener;
-            System.arraycopy(appEventListeners, 0, newEventListeners, 1, 
appEventListeners.length);
-            newEventListeners[newEventListeners.length - 1] = 
endWebBeansListener;
-            standardContext.setApplicationEventListeners(newEventListeners);
-
-            newLifecycleListeners[0] = beginWebBeansListener;
-            System.arraycopy(lifecycleListeners, 0, newLifecycleListeners, 1, 
lifecycleListeners.length);
-            newLifecycleListeners[newEventListeners.length - 1] = 
endWebBeansListener;
-            
standardContext.setApplicationLifecycleListeners(newLifecycleListeners);
+            {
+                final Object[] appEventListeners = 
standardContext.getApplicationEventListeners();
+                final Object[] newEventListeners = new 
Object[appEventListeners.length + 2];
+
+                newEventListeners[0] = beginWebBeansListener;
+                System.arraycopy(appEventListeners, 0, newEventListeners, 1, 
appEventListeners.length);
+                newEventListeners[newEventListeners.length - 1] = 
endWebBeansListener;
+                
standardContext.setApplicationEventListeners(newEventListeners);
+            }
+
+            {
+                final Object[] lifecycleListeners = 
standardContext.getApplicationLifecycleListeners();
+                final Object[] newLifecycleListeners = new 
Object[lifecycleListeners.length + 2];
+
+                newLifecycleListeners[0] = beginWebBeansListener;
+                System.arraycopy(lifecycleListeners, 0, newLifecycleListeners, 
1, lifecycleListeners.length);
+                newLifecycleListeners[newLifecycleListeners.length - 1] = 
endWebBeansListener;
+                
standardContext.setApplicationLifecycleListeners(newLifecycleListeners);
+            }
         }
 
         LinkageErrorProtection.preload(standardContext);