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

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

Author: ALRubinger
Date: 2008-09-12 14:06:11 -0400 (Fri, 12 Sep 2008)
New Revision: 78497

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionSpecContainer.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-1487] Remove ENC Push/Pop durnig container invocation

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionSpecContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionSpecContainer.java	2008-09-12 17:16:32 UTC (rev 78496)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/session/SessionSpecContainer.java	2008-09-12 18:06:11 UTC (rev 78497)
@@ -155,9 +155,6 @@
       ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
       Thread.currentThread().setContextClassLoader(this.getClassloader());
       
-      // Push the ENC onto the Stack
-      pushEnc();
-      
       try
       {
          
@@ -245,7 +242,6 @@
       {
          invokedMethod.pop();
          Thread.currentThread().setContextClassLoader(oldLoader);
-         popEnc();
       }
    }
 

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	2008-09-12 17:16:32 UTC (rev 78496)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateful/StatefulContainer.java	2008-09-12 18:06:11 UTC (rev 78497)
@@ -522,9 +522,6 @@
       // Set the Container's CL as TCL, required to unmarshall methods from the bean impl class
       Thread.currentThread().setContextClassLoader(this.getClassloader());
 
-      // Push the ENC onto the stack
-      pushEnc();
-
       try
       {
 
@@ -710,10 +707,7 @@
          SessionSpecContainer.invokedMethod.pop();
          
          // Reset the TCL to original
-         Thread.currentThread().setContextClassLoader(originalLoader);
-
-         // Pop the ENC off the stack
-         this.popEnc();
+         Thread.currentThread().setContextClassLoader(originalLoader);;
       }
    }
    

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	2008-09-12 17:16:32 UTC (rev 78496)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessContainer.java	2008-09-12 18:06:11 UTC (rev 78497)
@@ -393,9 +393,6 @@
 
       // Set the Container's CL as TCL, required to unmarshall methods from the bean impl class
       Thread.currentThread().setContextClassLoader(this.getClassloader());
-
-      // Push the ENC onto the stack
-      pushEnc();
       
       try
       {
@@ -486,14 +483,11 @@
             }
 
             invokeStats.callOut();
-
-            //invokedMethod.pop();
          }
       }
       finally
       {
          Thread.currentThread().setContextClassLoader(originalLoader);
-         this.popEnc();
       }
    }