[jboss-cvs] JBossAS SVN: r59552 - in branches/Branch_4_0/server/src/main/org/jboss/ejb: plugins and 1 other directory.

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

Author: bstansberry at jboss.com
Date: 2007-01-11 16:16:38 -0500 (Thu, 11 Jan 2007)
New Revision: 59552

Modified:
   branches/Branch_4_0/server/src/main/org/jboss/ejb/Container.java
   branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/EntityInstanceInterceptor.java
   branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/EntityMultiInstanceInterceptor.java
   branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/MessageDrivenInstanceInterceptor.java
   branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java
   branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java
Log:
[JBAS-3956] Clear PolicyContextHandler ThreadLocals

Modified: branches/Branch_4_0/server/src/main/org/jboss/ejb/Container.java
===================================================================
--- branches/Branch_4_0/server/src/main/org/jboss/ejb/Container.java	2007-01-11 20:24:15 UTC (rev 59551)
+++ branches/Branch_4_0/server/src/main/org/jboss/ejb/Container.java	2007-01-11 21:16:38 UTC (rev 59552)
@@ -1034,6 +1034,9 @@
             // Remove args from ThreadLocal to prevent leakage into the thread pool
             EJBArgsPolicyContextHandler.setArgs(null);
          }
+         
+         // Remove metadata from ThreadLocal to prevent leakage into the thread pool
+         BeanMetaDataPolicyContextHandler.setMetaData(null);
       }
    }
 

Modified: branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/EntityInstanceInterceptor.java
===================================================================
--- branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/EntityInstanceInterceptor.java	2007-01-11 20:24:15 UTC (rev 59551)
+++ branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/EntityInstanceInterceptor.java	2007-01-11 21:16:38 UTC (rev 59552)
@@ -341,10 +341,11 @@
             if (trace) log.trace("Ending invoke, cache removal, ctx=" + ctx);
             // no more pool return
          }
+         
+         EnterpriseBeanPolicyContextHandler.setEnterpriseBean(null);
 
          if (trace) log.trace("End invoke, key=" + key + ", ctx=" + ctx);
-
-      }	// end invoke
+      }// end finally
    }
 }
 

Modified: branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/EntityMultiInstanceInterceptor.java
===================================================================
--- branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/EntityMultiInstanceInterceptor.java	2007-01-11 20:24:15 UTC (rev 59551)
+++ branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/EntityMultiInstanceInterceptor.java	2007-01-11 21:16:38 UTC (rev 59552)
@@ -193,6 +193,7 @@
       finally
       {
          AllowedOperationsAssociation.popInMethodFlag();
+         EnterpriseBeanPolicyContextHandler.setEnterpriseBean(null);
       }
    }
 }

Modified: branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/MessageDrivenInstanceInterceptor.java
===================================================================
--- branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/MessageDrivenInstanceInterceptor.java	2007-01-11 20:24:15 UTC (rev 59551)
+++ branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/MessageDrivenInstanceInterceptor.java	2007-01-11 21:16:38 UTC (rev 59552)
@@ -134,7 +134,8 @@
       finally
       {
          AllowedOperationsAssociation.popInMethodFlag();
-
+         EnterpriseBeanPolicyContextHandler.setEnterpriseBean(null);
+         
          // Return context
          if (mi.getEnterpriseContext() != null)
          {

Modified: branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java
===================================================================
--- branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java	2007-01-11 20:24:15 UTC (rev 59551)
+++ branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java	2007-01-11 21:16:38 UTC (rev 59552)
@@ -390,6 +390,7 @@
       {
          container.getLockManager().removeLockRef(lock.getId());
          SecurityActions.popSubjectContext();
+         EnterpriseBeanPolicyContextHandler.setEnterpriseBean(null);
       }
    }
    

Modified: branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java
===================================================================
--- branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java	2007-01-11 20:24:15 UTC (rev 59551)
+++ branches/Branch_4_0/server/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java	2007-01-11 21:16:38 UTC (rev 59552)
@@ -188,7 +188,8 @@
       finally
       {
          AllowedOperationsAssociation.popInMethodFlag();
-
+         EnterpriseBeanPolicyContextHandler.setEnterpriseBean(null);
+         
          // Return context
          if (mi.getEnterpriseContext() != null)
          {