[jboss-cvs] JBossAS SVN: r88323 - projects/aop/branches/Branch_2_1/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:51:50 -0400 (Thu, 07 May 2009)
New Revision: 88323

Modified:
   projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/advice/ClassifiedBindingAndPointcutCollection.java
Log:
[JBAOP-726] Replaced all collections at ClassifiedBindingAndPointcutCollection (ConcurrentSet and CopyOnWriteArrayList) by plain old ArrayLists. 
This commit nullifies JBAOP-720.

Modified: projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/advice/ClassifiedBindingAndPointcutCollection.java
===================================================================
--- projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/advice/ClassifiedBindingAndPointcutCollection.java	2009-05-07 05:51:11 UTC (rev 88322)
+++ projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/advice/ClassifiedBindingAndPointcutCollection.java	2009-05-07 05:51:50 UTC (rev 88323)
@@ -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
@@ -633,7 +631,7 @@
       {
          if (fieldReadBindings == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            fieldReadBindings = new ConcurrentSet<AdviceBinding>();
+            fieldReadBindings = new ArrayList<AdviceBinding>();
          }
          this.fieldReadBindings.add(binding);
          this.addFieldReadPointcut(pointcutInfo.getPointcut(), pointcutInfo);
@@ -646,7 +644,7 @@
       {
          if (fieldWriteBindings == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            fieldWriteBindings = new ConcurrentSet<AdviceBinding>();
+            fieldWriteBindings = new ArrayList<AdviceBinding>();
          }
          this.fieldWriteBindings.add(binding);
          this.addFieldWritePointcut(pointcutInfo.getPointcut(), pointcutInfo);
@@ -659,7 +657,7 @@
       {
          if (constructionBindings == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            constructionBindings = new ConcurrentSet<AdviceBinding>();
+            constructionBindings = new ArrayList<AdviceBinding>();
          }
          this.constructionBindings.add(binding);
          this.addConstructionPointcut(pointcutInfo.getPointcut(), pointcutInfo);
@@ -672,7 +670,7 @@
       {
          if (constructorExecutionBindings == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            constructorExecutionBindings = new ConcurrentSet<AdviceBinding>();
+            constructorExecutionBindings = new ArrayList<AdviceBinding>();
          }
          this.constructorExecutionBindings.add(binding);
          this.addConstructorExecutionPointcut(pointcutInfo.getPointcut(), pointcutInfo);
@@ -685,7 +683,7 @@
       {
          if (methodExecutionBindings == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            methodExecutionBindings = new ConcurrentSet<AdviceBinding>();
+            methodExecutionBindings = new ArrayList<AdviceBinding>();
          }
          this.methodExecutionBindings.add(binding);
          this.addMethodExecutionPointcut(pointcutInfo.getPointcut(), pointcutInfo);
@@ -698,7 +696,7 @@
       {
          if (methodCallBindings == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            methodCallBindings = new ConcurrentSet<AdviceBinding>();
+            methodCallBindings = new ArrayList<AdviceBinding>();
          }
          this.methodCallBindings.add(binding);
          this.addMethodCallPointcut(pointcutInfo.getPointcut(), pointcutInfo);
@@ -711,7 +709,7 @@
       {
          if (constructorCallBindings == UnmodifiableEmptyCollections.EMPTY_ARRAYLIST)
          {
-            constructorCallBindings = new ConcurrentSet<AdviceBinding>();
+            constructorCallBindings = new ArrayList<AdviceBinding>();
          }
          this.constructorCallBindings.add(binding);
          this.addConstructorCallPointcut(pointcutInfo.getPointcut(), pointcutInfo);
@@ -748,13 +746,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);
       }
@@ -766,13 +764,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);
       }
@@ -784,13 +782,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);
       }
@@ -802,13 +800,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);
       }
@@ -820,13 +818,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);
       }
@@ -838,13 +836,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);
       }
@@ -856,13 +854,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);
       }