[jboss-cvs] JBossAS SVN: r109418 - in projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3: stateful and 1 other directories.

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

Author: jaikiran
Date: 2010-11-23 06:31:56 -0500 (Tue, 23 Nov 2010)
New Revision: 109418

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/mdb/MessagingContainer.java
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulContainer.java
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessContainer.java
Log:
EJBTHREE-2200 Push/pop the correct ENC during bean context and interceptor injection

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/mdb/MessagingContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/mdb/MessagingContainer.java	2010-11-23 07:28:11 UTC (rev 109417)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/mdb/MessagingContainer.java	2010-11-23 11:31:56 UTC (rev 109418)
@@ -97,6 +97,7 @@
    public BeanContext<?> createBeanContext()
    {
       MDBContext beanCtx = new MDBContext(this, construct());
+      this.pushEnc();
       this.pushContext(beanCtx);
       try
       {
@@ -106,6 +107,7 @@
       finally
       {
          this.popContext();
+         this.popEnc();
       }
       return beanCtx;
    }

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulContainer.java	2010-11-23 07:28:11 UTC (rev 109417)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulContainer.java	2010-11-23 11:31:56 UTC (rev 109418)
@@ -164,6 +164,7 @@
    public BeanContext<?> createBeanContext()
    {
       StatefulBeanContext beanCtx = new StatefulBeanContext(this, construct());
+      this.pushEnc();
       this.pushContext(beanCtx);
       try
       {
@@ -173,6 +174,7 @@
       finally
       {
          this.popContext();
+         this.popEnc();
       }
 
       return beanCtx;

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessContainer.java	2010-11-23 07:28:11 UTC (rev 109417)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessContainer.java	2010-11-23 11:31:56 UTC (rev 109418)
@@ -120,6 +120,7 @@
    {
       // construct the bean context
       StatelessBeanContext beanCtx = new StatelessBeanContext(this, construct());
+      this.pushEnc();
       this.pushContext(beanCtx);
       try
       {
@@ -129,6 +130,7 @@
       finally
       {
          this.popContext();
+         this.popEnc();
       }
 
       return beanCtx;