[jboss-cvs] JBossAS SVN: r87081 - projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop.

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

Author: kabir.khan at jboss.com
Date: 2009-04-09 10:33:45 -0400 (Thu, 09 Apr 2009)
New Revision: 87081

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

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:30:59 UTC (rev 87080)
+++ projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/Advisor.java	2009-04-09 14:33:45 UTC (rev 87081)
@@ -177,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 ConcurrentSet<AspectDefinition> perInstanceAspectDefinitions = UnmodifiableEmptyCollections.EMPTY_CONCURRENT_SET;
+   protected volatile Set<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 */