[jboss-cvs] JBossAS SVN: r87079 - in projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop: util and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2009-04-09 10:28:07 -0400 (Thu, 09 Apr 2009)
New Revision: 87079

Modified:
   projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/Advisor.java
   projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/util/UnmodifiableEmptyCollections.java
Log:
[JBAOP-716] Change Advisor.perInstanceAspectDefinitions from CopyOnWriteArraySet to ConcurrentSet

Modified: projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/Advisor.java
===================================================================
--- projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/Advisor.java	2009-04-09 14:23:47 UTC (rev 87078)
+++ projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/Advisor.java	2009-04-09 14:28:07 UTC (rev 87079)
@@ -82,6 +82,7 @@
 import org.jboss.metadata.spi.signature.MethodSignature;
 import org.jboss.util.NestedRuntimeException;
 import org.jboss.util.NotImplementedException;
+import org.jboss.util.collection.ConcurrentSet;
 
 /**
  * Manages the interceptor chains of an aspect context (usually, this context is
@@ -176,7 +177,7 @@
    /** Contains all the interceptor instances applied to this context. */
    protected HashMap<AspectDefinition, Map<String, Interceptor>> adviceInterceptors = new HashMap<AspectDefinition, Map<String, Interceptor>>();
    /** Contains all definitions of PER_INSTANCE aspects applied to this context. */
-   protected volatile CopyOnWriteArraySet<AspectDefinition> perInstanceAspectDefinitions = UnmodifiableEmptyCollections.EMPTY_COPYONWRITE_ARRAYSET;
+   protected volatile ConcurrentSet<AspectDefinition> perInstanceAspectDefinitions = UnmodifiableEmptyCollections.EMPTY_CONCURRENT_SET;
    /** Contains all definitions of PER_JOINPOINT scoped aspects applied to this sccontext*/
    protected volatile ConcurrentHashMap<AspectDefinition, Set<Joinpoint>> perInstanceJoinpointAspectDefinitions = UnmodifiableEmptyCollections.EMPTY_CONCURRENT_HASHMAP;
    /** The {@code java.lang.String} class */
@@ -2079,13 +2080,13 @@
    
    protected void initPerInstanceAspectDefinitionsSet()
    {
-      if (perInstanceAspectDefinitions == UnmodifiableEmptyCollections.EMPTY_COPYONWRITE_ARRAYSET)
+      if (perInstanceAspectDefinitions == UnmodifiableEmptyCollections.EMPTY_CONCURRENT_SET)
       {
          synchronized(lazyCollectionLock)
          {
-            if (perInstanceAspectDefinitions == UnmodifiableEmptyCollections.EMPTY_COPYONWRITE_ARRAYSET)
+            if (perInstanceAspectDefinitions == UnmodifiableEmptyCollections.EMPTY_CONCURRENT_SET)
             {
-               perInstanceAspectDefinitions = new CopyOnWriteArraySet<AspectDefinition>();
+               perInstanceAspectDefinitions = new ConcurrentSet<AspectDefinition>();
             }
          }
       }

Modified: projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/util/UnmodifiableEmptyCollections.java
===================================================================
--- projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/util/UnmodifiableEmptyCollections.java	2009-04-09 14:23:47 UTC (rev 87078)
+++ projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/util/UnmodifiableEmptyCollections.java	2009-04-09 14:28:07 UTC (rev 87079)
@@ -32,6 +32,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 
+import org.jboss.util.collection.ConcurrentSet;
 import org.jboss.util.collection.WeakValueHashMap;
 
 
@@ -53,6 +54,7 @@
    @SuppressWarnings("unchecked") public static final CopyOnWriteArraySet EMPTY_COPYONWRITE_ARRAYSET = new LockedCopyOnWriteArraySet();
    public static final TLongObjectHashMap EMPTY_TLONG_OBJECT_HASHMAP = new LockedTLongObjectHashMap();
    @SuppressWarnings("unchecked") public static final ConcurrentHashMap EMPTY_CONCURRENT_HASHMAP = new LockedConcurrentHashMap();
+   @SuppressWarnings("unchecked") public static final ConcurrentSet EMPTY_CONCURRENT_SET = new ConcurrentSet();
 
    private static class LockedHashMap<K,V> extends HashMap<K,V>
    {