[jboss-cvs] JBossAS SVN: r59509 - branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins.

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

Author: bstansberry at jboss.com
Date: 2007-01-11 01:05:06 -0500 (Thu, 11 Jan 2007)
New Revision: 59509

Modified:
   branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/MessageDrivenInstanceInterceptor.java
   branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java
   branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java
Log:
[JBAS-3956] Clear PolicyContextHandler ThreadLocal

Modified: branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/MessageDrivenInstanceInterceptor.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/MessageDrivenInstanceInterceptor.java	2007-01-11 06:03:48 UTC (rev 59508)
+++ branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/MessageDrivenInstanceInterceptor.java	2007-01-11 06:05:06 UTC (rev 59509)
@@ -134,7 +134,8 @@
       finally
       {
          AllowedOperationsAssociation.popInMethodFlag();
-
+         EnterpriseBeanPolicyContextHandler.setEnterpriseBean(null);
+         
          // Return context
          if (mi.getEnterpriseContext() != null)
          {

Modified: branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java	2007-01-11 06:03:48 UTC (rev 59508)
+++ branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java	2007-01-11 06:05:06 UTC (rev 59509)
@@ -390,6 +390,7 @@
       {
          container.getLockManager().removeLockRef(lock.getId());
          SecurityActions.popSubjectContext();
+         EnterpriseBeanPolicyContextHandler.setEnterpriseBean(null);
       }
    }
    

Modified: branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java	2007-01-11 06:03:48 UTC (rev 59508)
+++ branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java	2007-01-11 06:05:06 UTC (rev 59509)
@@ -188,7 +188,8 @@
       finally
       {
          AllowedOperationsAssociation.popInMethodFlag();
-
+         EnterpriseBeanPolicyContextHandler.setEnterpriseBean(null);
+         
          // Return context
          if (mi.getEnterpriseContext() != null)
          {