[jboss-cvs] JBossAS SVN: r109406 - projects/ejb3/trunk/core/src/main/resources.

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

Author: wolfc
Date: 2010-11-22 04:54:42 -0500 (Mon, 22 Nov 2010)
New Revision: 109406

Modified:
   projects/ejb3/trunk/core/src/main/resources/ejb3-interceptors-aop.xml
Log:
EJBTHREE-2179: SFSB concurrency

Modified: projects/ejb3/trunk/core/src/main/resources/ejb3-interceptors-aop.xml
===================================================================
--- projects/ejb3/trunk/core/src/main/resources/ejb3-interceptors-aop.xml	2010-11-22 07:23:50 UTC (rev 109405)
+++ projects/ejb3/trunk/core/src/main/resources/ejb3-interceptors-aop.xml	2010-11-22 09:54:42 UTC (rev 109406)
@@ -9,6 +9,7 @@
    <interceptor class="org.jboss.aspects.remoting.ClusterChooserInterceptor" scope="PER_VM"/>
    <interceptor class="org.jboss.ejb3.async.impl.interceptor.AsynchronousInterceptor" SCOPE="PER_VM" />
    <interceptor class="org.jboss.ejb3.async.impl.interceptor.FutureSerializingInterceptor" scope="PER_VM"/>
+   <interceptor name="CMConcurrency" factory="org.jboss.ejb3.concurrency.aop.interceptor.ContainerManagedConcurrencyInterceptorFactory" scope="PER_INSTANCE"/>
 
    <interceptor class="org.jboss.aspects.tx.TxPropagationInterceptor" scope="PER_VM"/>
    
@@ -284,6 +285,8 @@
          <interceptor-ref name="org.jboss.ejb3.stateful.StatefulInstanceInterceptor"/>
          <interceptor-ref name="org.jboss.ejb3.tx.BMTTxInterceptorFactory"/>
          <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
+         <!-- CMConcurrency must happen after an instance is associated -->
+         <interceptor-ref name="CMConcurrency"/>
          <!-- EJBTHREE-2020: session synchronization callbacks must be called within a context -->
          <interceptor-ref name="org.jboss.ejb3.stateful.SessionSynchronizationInterceptor"/>
          <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>