You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/06/05 11:25:31 UTC
svn commit: r1346310 - in
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi:
BeansDeployer.java OpenEJBLifecycle.java
Author: rmannibucau
Date: Tue Jun 5 09:25:30 2012
New Revision: 1346310
URL: http://svn.apache.org/viewvc?rev=1346310&view=rev
Log:
constant for Annotation[0]
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java?rev=1346310&r1=1346309&r2=1346310&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/BeansDeployer.java Tue Jun 5 09:25:30 2012
@@ -80,6 +80,9 @@ public class BeansDeployer {
//Logger instance
private static final WebBeansLogger logger = WebBeansLogger.getLogger(BeansDeployer.class);
+ // why creating it several times?
+ public static final Annotation[] EMPTY_ANNOTATION_ARRAY = new Annotation[0];
+
/**XML Configurator*/
protected final WebBeansXMLConfigurator xmlConfigurator;
@@ -146,7 +149,7 @@ public class BeansDeployer {
void fireBeforeBeanDiscoveryEvent()
{
BeanManager manager = webBeansContext.getBeanManagerImpl();
- manager.fireEvent(new BeforeBeanDiscoveryImpl(webBeansContext),new Annotation[0]);
+ manager.fireEvent(new BeforeBeanDiscoveryImpl(webBeansContext), EMPTY_ANNOTATION_ARRAY);
}
/**
@@ -155,7 +158,7 @@ public class BeansDeployer {
void fireAfterBeanDiscoveryEvent()
{
BeanManagerImpl manager = webBeansContext.getBeanManagerImpl();
- manager.fireEvent(new AfterBeanDiscoveryImpl(webBeansContext),new Annotation[0]);
+ manager.fireEvent(new AfterBeanDiscoveryImpl(webBeansContext),EMPTY_ANNOTATION_ARRAY);
webBeansContext.getWebBeansUtil().inspectErrorStack("There are errors that are added by AfterBeanDiscovery event observers. Look at logs for further details");
}
@@ -166,7 +169,7 @@ public class BeansDeployer {
void fireAfterDeploymentValidationEvent()
{
BeanManagerImpl manager = webBeansContext.getBeanManagerImpl();
- manager.fireEvent(new AfterDeploymentValidationImpl(manager),new Annotation[0]);
+ manager.fireEvent(new AfterDeploymentValidationImpl(manager),EMPTY_ANNOTATION_ARRAY);
webBeansContext.getWebBeansUtil().inspectErrorStack("There are errors that are added by AfterDeploymentValidation event observers. Look at logs for further details");
}
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java?rev=1346310&r1=1346309&r2=1346310&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cdi/OpenEJBLifecycle.java Tue Jun 5 09:25:30 2012
@@ -415,7 +415,7 @@ public class OpenEJBLifecycle implements
beforeStopApplication(endObject);
//Fire shut down
- this.beanManager.fireEvent(new BeforeShutdownImpl(), new Annotation[0]);
+ this.beanManager.fireEvent(new BeforeShutdownImpl(), BeansDeployer.EMPTY_ANNOTATION_ARRAY);
//Destroys context
this.contextsService.destroy(endObject);