Index: src/main/resources/ejb3-interceptors-aop.xml
===================================================================
--- src/main/resources/ejb3-interceptors-aop.xml	(revision 108384)
+++ src/main/resources/ejb3-interceptors-aop.xml	(working copy)
@@ -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"/>
       </bind>
       <!-- EJBTHREE-2020: session synchronization callbacks must be called within a context -->
       <bind pointcut="execution(public * $instanceof{javax.ejb.SessionSynchronization}->*(..))">
@@ -530,4 +533,4 @@
       </bind>
    </domain>
 
-</aop>
\ No newline at end of file
+</aop>