[jboss-cvs] JBossAS SVN: r88316 - projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice.

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

Author: flavia.rainone at jboss.com
Date: 2009-05-07 01:11:40 -0400 (Thu, 07 May 2009)
New Revision: 88316

Modified:
   projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/ClassifiedBindingAndPointcutCollection.java
Log:
[JBAOP-727] Added a call to applyPrecedence at all finalize*CalledBy*InterceptorChain methods belonging to ClassAdvisor. Added call scenarios to precedence tests.

Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/ClassifiedBindingAndPointcutCollection.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/ClassifiedBindingAndPointcutCollection.java	2009-05-07 03:07:20 UTC (rev 88315)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/advice/ClassifiedBindingAndPointcutCollection.java	2009-05-07 05:11:40 UTC (rev 88316)
@@ -24,7 +24,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.jboss.aop.AspectManager;
 import org.jboss.aop.pointcut.Pointcut;
@@ -35,7 +34,6 @@
 import org.jboss.aop.util.UnmodifiableEmptyCollections;
 import org.jboss.aop.util.UnmodifiableLinkedHashMap;
 import org.jboss.aop.util.logging.AOPLogger;
-import org.jboss.util.collection.ConcurrentSet;
 
 /**
  * Manages the binding, pointcut and pointcutInfo collections contained in a domain. All entries
@@ -823,7 +821,7 @@
       {
          if (fieldReadBindings == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            fieldReadBindings = new ConcurrentSet<AdviceBinding>();
+            fieldReadBindings = new ArrayList<AdviceBinding>();
          }
          this.fieldReadBindings.add(binding);
          this.addFieldReadPointcut(pointcutInfo.getPointcut(), pointcutInfo);
@@ -836,7 +834,7 @@
       {
          if (fieldWriteBindings == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            fieldWriteBindings = new ConcurrentSet<AdviceBinding>();
+            fieldWriteBindings = new ArrayList<AdviceBinding>();
          }
          this.fieldWriteBindings.add(binding);
          this.addFieldWritePointcut(pointcutInfo.getPointcut(), pointcutInfo);
@@ -849,7 +847,7 @@
       {
          if (constructionBindings == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            constructionBindings = new ConcurrentSet<AdviceBinding>();
+            constructionBindings = new ArrayList<AdviceBinding>();
          }
          this.constructionBindings.add(binding);
          this.addConstructionPointcut(pointcutInfo.getPointcut(), pointcutInfo);
@@ -862,7 +860,7 @@
       {
          if (constructorExecutionBindings == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            constructorExecutionBindings = new ConcurrentSet<AdviceBinding>();
+            constructorExecutionBindings = new ArrayList<AdviceBinding>();
          }
          this.constructorExecutionBindings.add(binding);
          this.addConstructorExecutionPointcut(pointcutInfo.getPointcut(), pointcutInfo);
@@ -875,7 +873,7 @@
       {
          if (methodExecutionBindings == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            methodExecutionBindings = new ConcurrentSet<AdviceBinding>();
+            methodExecutionBindings = new ArrayList<AdviceBinding>();
          }
          this.methodExecutionBindings.add(binding);
          this.addMethodExecutionPointcut(pointcutInfo.getPointcut(), pointcutInfo);
@@ -888,7 +886,7 @@
       {
          if (methodCallBindings == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            methodCallBindings = new ConcurrentSet<AdviceBinding>();
+            methodCallBindings = new ArrayList<AdviceBinding>();
          }
          this.methodCallBindings.add(binding);
          this.addMethodCallPointcut(pointcutInfo.getPointcut(), pointcutInfo);
@@ -901,7 +899,7 @@
       {
          if (constructorCallBindings == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            constructorCallBindings = new ConcurrentSet<AdviceBinding>();
+            constructorCallBindings = new ArrayList<AdviceBinding>();
          }
          this.constructorCallBindings.add(binding);
          this.addConstructorCallPointcut(pointcutInfo.getPointcut(), pointcutInfo);
@@ -938,13 +936,13 @@
       {
          if (fieldReadPointcuts == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            fieldReadPointcuts = new CopyOnWriteArrayList<Pointcut>();
+            fieldReadPointcuts = new ArrayList<Pointcut>();
          }
          fieldReadPointcuts.add(pointcut);
    
          if (fieldReadPointcutInfos == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            fieldReadPointcutInfos = new CopyOnWriteArrayList<PointcutInfo>();
+            fieldReadPointcutInfos = new ArrayList<PointcutInfo>();
          }
          fieldReadPointcutInfos.add(info);
       }
@@ -956,13 +954,13 @@
       {
          if (fieldWritePointcuts == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            fieldWritePointcuts = new CopyOnWriteArrayList<Pointcut>();
+            fieldWritePointcuts = new ArrayList<Pointcut>();
          }
          fieldWritePointcuts.add(pointcut);
    
          if (fieldWritePointcutInfos == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            fieldWritePointcutInfos = new CopyOnWriteArrayList<PointcutInfo>();
+            fieldWritePointcutInfos = new ArrayList<PointcutInfo>();
          }
          fieldWritePointcutInfos.add(info);
       }
@@ -974,13 +972,13 @@
       {
          if (constructionPointcuts == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            constructionPointcuts = new CopyOnWriteArrayList<Pointcut>();
+            constructionPointcuts = new ArrayList<Pointcut>();
          }
          constructionPointcuts.add(pointcut);
    
          if (constructionPointcutInfos == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            constructionPointcutInfos = new CopyOnWriteArrayList<PointcutInfo>();
+            constructionPointcutInfos = new ArrayList<PointcutInfo>();
          }
          constructionPointcutInfos.add(info);
       }
@@ -992,13 +990,13 @@
       {
          if (constructorExecutionPointcuts == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            constructorExecutionPointcuts = new CopyOnWriteArrayList<Pointcut>();
+            constructorExecutionPointcuts = new ArrayList<Pointcut>();
          }
          constructorExecutionPointcuts.add(pointcut);
    
          if (constructorExecutionPointcutInfos == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            constructorExecutionPointcutInfos = new CopyOnWriteArrayList<PointcutInfo>();
+            constructorExecutionPointcutInfos = new ArrayList<PointcutInfo>();
          }
          constructorExecutionPointcutInfos.add(info);
       }
@@ -1010,13 +1008,13 @@
       {
          if (methodExecutionPointcuts == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            methodExecutionPointcuts = new CopyOnWriteArrayList<Pointcut>();
+            methodExecutionPointcuts = new ArrayList<Pointcut>();
          }
          methodExecutionPointcuts.add(pointcut);
    
          if (methodExecutionPointcutInfos == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            methodExecutionPointcutInfos = new CopyOnWriteArrayList<PointcutInfo>();
+            methodExecutionPointcutInfos = new ArrayList<PointcutInfo>();
          }
          methodExecutionPointcutInfos.add(info);
       }
@@ -1028,13 +1026,13 @@
       {
          if (constructorCallPointcuts == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            constructorCallPointcuts = new CopyOnWriteArrayList<Pointcut>();
+            constructorCallPointcuts = new ArrayList<Pointcut>();
          }
          constructorCallPointcuts.add(pointcut);
    
          if (constructorCallPointcutInfos == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            constructorCallPointcutInfos = new CopyOnWriteArrayList<PointcutInfo>();
+            constructorCallPointcutInfos = new ArrayList<PointcutInfo>();
          }
          constructorCallPointcutInfos.add(info);
       }
@@ -1046,13 +1044,13 @@
       {
          if (methodCallPointcuts == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            methodCallPointcuts = new CopyOnWriteArrayList<Pointcut>();
+            methodCallPointcuts = new ArrayList<Pointcut>();
          }
          methodCallPointcuts.add(pointcut);
    
          if (methodCallPointcutInfos == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            methodCallPointcutInfos = new CopyOnWriteArrayList<PointcutInfo>();
+            methodCallPointcutInfos = new ArrayList<PointcutInfo>();
          }
          methodCallPointcutInfos.add(info);
       }