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

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

Author: galder.zamarreno at jboss.com
Date: 2007-01-23 10:10:44 -0500 (Tue, 23 Jan 2007)
New Revision: 59938

Modified:
   branches/JBoss_4_0_5_GA_JBAS-3999/server/src/main/org/jboss/ejb/Container.java
   branches/JBoss_4_0_5_GA_JBAS-3999/server/src/main/org/jboss/ejb/plugins/EntityInstanceInterceptor.java
   branches/JBoss_4_0_5_GA_JBAS-3999/server/src/main/org/jboss/ejb/plugins/EntityMultiInstanceInterceptor.java
   branches/JBoss_4_0_5_GA_JBAS-3999/server/src/main/org/jboss/ejb/plugins/MessageDrivenInstanceInterceptor.java
   branches/JBoss_4_0_5_GA_JBAS-3999/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java
   branches/JBoss_4_0_5_GA_JBAS-3999/server/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java
Log:
[JBAS-3999] Merging in JBAS-3991

Modified: branches/JBoss_4_0_5_GA_JBAS-3999/server/src/main/org/jboss/ejb/Container.java
===================================================================
--- branches/JBoss_4_0_5_GA_JBAS-3999/server/src/main/org/jboss/ejb/Container.java	2007-01-23 14:28:02 UTC (rev 59937)
+++ branches/JBoss_4_0_5_GA_JBAS-3999/server/src/main/org/jboss/ejb/Container.java	2007-01-23 15:10:44 UTC (rev 59938)
@@ -1033,6 +1033,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/JBoss_4_0_5_GA_JBAS-3999/server/src/main/org/jboss/ejb/plugins/EntityInstanceInterceptor.java
===================================================================
--- branches/JBoss_4_0_5_GA_JBAS-3999/server/src/main/org/jboss/ejb/plugins/EntityInstanceInterceptor.java	2007-01-23 14:28:02 UTC (rev 59937)
+++ branches/JBoss_4_0_5_GA_JBAS-3999/server/src/main/org/jboss/ejb/plugins/EntityInstanceInterceptor.java	2007-01-23 15:10:44 UTC (rev 59938)
@@ -342,9 +342,11 @@
             // no more pool return
          }
 
+         EnterpriseBeanPolicyContextHandler.setEnterpriseBean(null);
+         
          if (trace) log.trace("End invoke, key=" + key + ", ctx=" + ctx);
 
-      }	// end invoke
+      }	// end finally
    }
 }
 

Modified: branches/JBoss_4_0_5_GA_JBAS-3999/server/src/main/org/jboss/ejb/plugins/EntityMultiInstanceInterceptor.java
===================================================================
--- branches/JBoss_4_0_5_GA_JBAS-3999/server/src/main/org/jboss/ejb/plugins/EntityMultiInstanceInterceptor.java	2007-01-23 14:28:02 UTC (rev 59937)
+++ branches/JBoss_4_0_5_GA_JBAS-3999/server/src/main/org/jboss/ejb/plugins/EntityMultiInstanceInterceptor.java	2007-01-23 15:10:44 UTC (rev 59938)
@@ -193,6 +193,7 @@
       finally
       {
          AllowedOperationsAssociation.popInMethodFlag();
+         EnterpriseBeanPolicyContextHandler.setEnterpriseBean(null);
       }
    }
 }

Modified: branches/JBoss_4_0_5_GA_JBAS-3999/server/src/main/org/jboss/ejb/plugins/MessageDrivenInstanceInterceptor.java
===================================================================
--- branches/JBoss_4_0_5_GA_JBAS-3999/server/src/main/org/jboss/ejb/plugins/MessageDrivenInstanceInterceptor.java	2007-01-23 14:28:02 UTC (rev 59937)
+++ branches/JBoss_4_0_5_GA_JBAS-3999/server/src/main/org/jboss/ejb/plugins/MessageDrivenInstanceInterceptor.java	2007-01-23 15:10:44 UTC (rev 59938)
@@ -134,7 +134,8 @@
       finally
       {
          AllowedOperationsAssociation.popInMethodFlag();
-
+         EnterpriseBeanPolicyContextHandler.setEnterpriseBean(null);
+         
          // Return context
          if (mi.getEnterpriseContext() != null)
          {

Modified: branches/JBoss_4_0_5_GA_JBAS-3999/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java
===================================================================
--- branches/JBoss_4_0_5_GA_JBAS-3999/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java	2007-01-23 14:28:02 UTC (rev 59937)
+++ branches/JBoss_4_0_5_GA_JBAS-3999/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java	2007-01-23 15:10:44 UTC (rev 59938)
@@ -390,6 +390,7 @@
       {
          container.getLockManager().removeLockRef(lock.getId());
          SecurityActions.popSubjectContext();
+         EnterpriseBeanPolicyContextHandler.setEnterpriseBean(null);
       }
    }
    

Modified: branches/JBoss_4_0_5_GA_JBAS-3999/server/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java
===================================================================
--- branches/JBoss_4_0_5_GA_JBAS-3999/server/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java	2007-01-23 14:28:02 UTC (rev 59937)
+++ branches/JBoss_4_0_5_GA_JBAS-3999/server/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java	2007-01-23 15:10:44 UTC (rev 59938)
@@ -188,6 +188,7 @@
       finally
       {
          AllowedOperationsAssociation.popInMethodFlag();
+         EnterpriseBeanPolicyContextHandler.setEnterpriseBean(null);
 
          // Return context
          if (mi.getEnterpriseContext() != null)