[jboss-cvs] JBossAS SVN: r98077 - in projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins: dependency and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2009-12-21 07:43:51 -0500 (Mon, 21 Dec 2009)
New Revision: 98077

Modified:
   projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java
   projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/QualifiersMdrUtil.java
Log:
[JBKERNEL-63] Use cached metadata context

Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java	2009-12-21 12:41:04 UTC (rev 98076)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java	2009-12-21 12:43:51 UTC (rev 98077)
@@ -40,6 +40,7 @@
 import org.jboss.beans.info.spi.PropertyInfo;
 import org.jboss.beans.metadata.api.annotations.MCAnnotations;
 import org.jboss.logging.Logger;
+import org.jboss.metadata.api.MetaDataUtils;
 import org.jboss.metadata.spi.MetaData;
 import org.jboss.metadata.spi.signature.ConstructorSignature;
 import org.jboss.metadata.spi.signature.DeclaredMethodSignature;
@@ -326,6 +327,9 @@
       if (handle == null)
          throw new IllegalArgumentException("Null handle.");
 
+      //Use cached metadata context
+      retrieval = MetaDataUtils.createCachedMetaData(retrieval);
+      
       boolean trace = log.isTraceEnabled();
       if (trace)
          log.trace(getName(handle) + " apply annotations");

Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/QualifiersMdrUtil.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/QualifiersMdrUtil.java	2009-12-21 12:41:04 UTC (rev 98076)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/QualifiersMdrUtil.java	2009-12-21 12:43:51 UTC (rev 98077)
@@ -45,6 +45,7 @@
 import org.jboss.kernel.plugins.config.Configurator;
 import org.jboss.kernel.spi.dependency.KernelControllerContext;
 import org.jboss.logging.Logger;
+import org.jboss.metadata.api.MetaDataUtils;
 import org.jboss.metadata.spi.MetaData;
 import org.jboss.metadata.spi.MutableMetaData;
 import org.jboss.metadata.spi.repository.MetaDataRepository;
@@ -389,6 +390,10 @@
    private static Set<Annotation> getQualifiersFromAnnotationsForInjectionPointParents(KernelControllerContext context, List<MetaDataVisitorNode>parents, MetaData metaData) throws Exception
    {
       Set<Annotation> annotationQualifiers = null;
+      
+      //Use cached metadata context
+      metaData = MetaDataUtils.createCachedMetaData(metaData);
+      
       for (int i = 0 ; i < parents.size() ; i++)
       {
          MetaDataVisitorNode node = parents.get(i);
@@ -485,6 +490,7 @@
    {
       if (metaData == null)
          return qualifiers;
+      
       for (Class<? extends Annotation> meta : QUALIFIERS)
       {
          for (Annotation annotation : metaData.getAnnotationsAnnotatedWith(meta))