[jboss-cvs] JBossAS SVN: r59093 - branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop

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

Author: kabir.khan at jboss.com
Date: 2006-12-18 17:07:50 -0500 (Mon, 18 Dec 2006)
New Revision: 59093

Modified:
   branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/AspectManager.java
   branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/Domain.java
Log:
[JBAOP-331] IgnoreExpressions for a domain should be got from main AspectManager

Modified: branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/AspectManager.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/AspectManager.java	2006-12-18 21:29:07 UTC (rev 59092)
+++ branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/AspectManager.java	2006-12-18 22:07:50 UTC (rev 59093)
@@ -638,7 +638,6 @@
 
    public ClassPool findClassPool(ClassLoader cl)
    {
-//      System.out.println("------> Calling findClassPool with " + cl);
       if (!(cl instanceof Translatable))
       {
          // findClassPool has problems with boot and system classes.
@@ -722,9 +721,10 @@
    {
       ArrayList ignore = getIgnore();
       if (ignore == null) return false;
-      for (int i = 0; i < ignoreExpressions.length; i++)
+      ClassExpression[] ignoreExprs = getIgnoreExpressions();
+      for (int i = 0; i < ignoreExprs.length; i++)
       {
-         if(ignoreExpressions[i].matches(classname)) return true;
+         if(ignoreExprs[i].matches(classname)) return true;
       }
       return false;
    }
@@ -1979,7 +1979,6 @@
    private boolean copySubDomainsFromQueue(boolean increment)
    {
       boolean copied = false;
-//      System.out.println("Entering " + this + " " + )
       synchronized (subscribedSubDomains)
       {
          if (!increment && subscribedDomainQueueRef > 0) subscribedDomainQueueRef--;

Modified: branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/Domain.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/Domain.java	2006-12-18 21:29:07 UTC (rev 59092)
+++ branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/Domain.java	2006-12-18 22:07:50 UTC (rev 59093)
@@ -56,6 +56,12 @@
    protected boolean inheritsBindings = false;
 
 
+   public Domain(AspectManager manager, boolean parentFirst)
+   {
+      //Ignore the name - it is used by AOP 2.0
+      this(manager, null, parentFirst);
+   }
+
    public Domain(AspectManager manager, String name, boolean parentFirst)
    {
       this.parent = manager;
@@ -751,7 +757,7 @@
    /** Only set on a per vm basis */
    public ClassExpression[] getIgnoreExpressions()
    {
-      return super.getIgnoreExpressions();
+      return parent.getIgnoreExpressions();
    }
    
    public DynamicAOPStrategy getDynamicAOPStrategy()