[jboss-cvs] JBossAS SVN: r77316 - projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans.

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

Author: kabir.khan at jboss.com
Date: 2008-08-21 09:27:44 -0400 (Thu, 21 Aug 2008)
New Revision: 77316

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/AspectManagerFactory.java
Log:
Fix NPE and look for AspectManager in context's metadata

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/AspectManagerFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/AspectManagerFactory.java	2008-08-21 13:24:08 UTC (rev 77315)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/AspectManagerFactory.java	2008-08-21 13:27:44 UTC (rev 77316)
@@ -46,6 +46,14 @@
       AspectManager manager = AspectManager.instance();
       if (md != null)
       {
+         AspectManager metaDataManager = md.getMetaData(AspectManager.class);
+         
+         if (metaDataManager != null)
+         {
+            return metaDataManager;
+         }
+            
+         
          ApplicationScope app = md.getMetaData(ApplicationScope.class);
          DeploymentScope dep = md.getMetaData(DeploymentScope.class);
          if (app != null && dep != null)