[jboss-cvs] JBossAS SVN: r88828 - projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration.

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

Author: alesj
Date: 2009-05-13 13:51:28 -0400 (Wed, 13 May 2009)
New Revision: 88828

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java
   projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java
Log:
Expose aop bypass check.

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java	2009-05-13 17:34:10 UTC (rev 88827)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPConstructorJoinpoint.java	2009-05-13 17:51:28 UTC (rev 88828)
@@ -87,10 +87,21 @@
       this.metaData = MetaData.class.cast(metaData);
    }
 
+   /**
+    * Should we bypass AOP.
+    *
+    * @param metaData the metadata instance
+    * @return true if we should bypass aop, false otherwise
+    */
+   protected boolean bypassAOP(MetaData metaData)
+   {
+      return DisableAOPHelper.isAOPDisabled(metaData);
+   }
+
    @SuppressWarnings("deprecation")
    public Object dispatch() throws Throwable
    {
-      if (DisableAOPHelper.isAOPDisabled(metaData))
+      if (bypassAOP(metaData))
       {
          return super.dispatch();
       }

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java	2009-05-13 17:34:10 UTC (rev 88827)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/java/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java	2009-05-13 17:51:28 UTC (rev 88828)
@@ -76,11 +76,23 @@
    private static final String DEPENDENCY_NAME_ATTRIBUTE = "name";
    private static final IntrospectionAnnotationHelper helper = new IntrospectionAnnotationHelper();
 
+   /**
+    * Should we bypass AOP.
+    *
+    * @param beanInfo the bean info
+    * @param metaData the metadata instance
+    * @return true if we should bypass aop, false otherwise
+    */
+   protected boolean bypassAOP(BeanInfo beanInfo, MetaData metaData)
+   {
+      return DisableAOPHelper.isAOPDisabled(metaData);
+   }
+
    @SuppressWarnings({"unchecked", "deprecation"})
    @Override
    public List<DependencyBuilderListItem> getDependencies(BeanInfo beanInfo, MetaData metaData)
    {
-      if (DisableAOPHelper.isAOPDisabled(metaData))
+      if (bypassAOP(beanInfo, metaData))
       {
          return super.getDependencies(beanInfo, metaData);
       }