[jboss-cvs] JBossAS SVN: r97605 - projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/plugins/context.

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

Author: alesj
Date: 2009-12-09 07:50:06 -0500 (Wed, 09 Dec 2009)
New Revision: 97605

Modified:
   projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/plugins/context/CachingMetaDataContext.java
Log:
Cache only cacheables.

Modified: projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/plugins/context/CachingMetaDataContext.java
===================================================================
--- projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/plugins/context/CachingMetaDataContext.java	2009-12-09 12:49:09 UTC (rev 97604)
+++ projects/jboss-mdr/trunk/src/main/java/org/jboss/metadata/plugins/context/CachingMetaDataContext.java	2009-12-09 12:50:06 UTC (rev 97605)
@@ -246,7 +246,12 @@
       }
 
       //super call will put the values into cache
-      return super.retrieveAnnotationsAnnotatedWith(meta);
+      AnnotationsItem result = super.retrieveAnnotationsAnnotatedWith(meta);
+      if (result != null && result.isCachable() == false && cachedMetaAnnotations != null)
+      {
+         cachedMetaAnnotations.remove(meta);
+      }
+      return result;
    }
 
    @Override