You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2011/02/28 18:46:51 UTC
svn commit: r1075446 - in
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans:
config/BeansDeployer.java corespi/scanner/AbstractMetaDataDiscovery.java
portable/AnnotatedElementFactory.java
Author: struberg
Date: Mon Feb 28 17:46:51 2011
New Revision: 1075446
URL: http://svn.apache.org/viewvc?rev=1075446&view=rev
Log:
OWB-537 cleanup AnnotatedElementFactory after deployment
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedElementFactory.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=1075446&r1=1075445&r2=1075446&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java Mon Feb 28 17:46:51 2011
@@ -178,7 +178,11 @@ public class BeansDeployer
//Fire Event
fireAfterDeploymentValidationEvent();
+
+ // do some cleanup after the deployment
scanner.release();
+ webBeansContext.getAnnotatedElementFactory().clear();
+
deployed = true;
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java?rev=1075446&r1=1075445&r2=1075446&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java Mon Feb 28 17:46:51 2011
@@ -66,10 +66,10 @@ public abstract class AbstractMetaDataDi
{
annotationDB = new AnnotationDB();
annotationDB.setScanClassAnnotations(true);
- annotationDB.crossReferenceMetaAnnotations();
annotationDB.setScanFieldAnnotations(false);
annotationDB.setScanMethodAnnotations(false);
annotationDB.setScanParameterAnnotations(false);
+ annotationDB.crossReferenceMetaAnnotations();
}
catch(Exception e)
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedElementFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedElementFactory.java?rev=1075446&r1=1075445&r2=1075446&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedElementFactory.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedElementFactory.java Mon Feb 28 17:46:51 2011
@@ -86,7 +86,7 @@ public final class AnnotatedElementFacto
public <X> AnnotatedType<X> newAnnotatedType(Class<X> annotatedClass)
{
Asserts.assertNotNull(annotatedClass, "annotatedClass is null");
- AnnotatedTypeImpl<X> annotatedType = null;
+ AnnotatedTypeImpl<X> annotatedType;
if(annotatedTypeCache.containsKey(annotatedClass))
{
annotatedType = (AnnotatedTypeImpl<X>)annotatedTypeCache.get(annotatedClass);