[jboss-cvs] JBossAS SVN: r59510 - in trunk/server/src/main/org/jboss/ejb: plugins and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 11 01:36:25 EST 2007
Author: bstansberry at jboss.com
Date: 2007-01-11 01:36:23 -0500 (Thu, 11 Jan 2007)
New Revision: 59510
Modified:
trunk/server/src/main/org/jboss/ejb/Container.java
trunk/server/src/main/org/jboss/ejb/plugins/EntityInstanceInterceptor.java
trunk/server/src/main/org/jboss/ejb/plugins/EntityMultiInstanceInterceptor.java
trunk/server/src/main/org/jboss/ejb/plugins/MessageDrivenInstanceInterceptor.java
trunk/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java
trunk/server/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java
Log:
[JBAS-3956] Clear PolicyContextHandler ThreadLocals
Modified: trunk/server/src/main/org/jboss/ejb/Container.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/Container.java 2007-01-11 06:05:06 UTC (rev 59509)
+++ trunk/server/src/main/org/jboss/ejb/Container.java 2007-01-11 06:36:23 UTC (rev 59510)
@@ -1063,6 +1063,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: trunk/server/src/main/org/jboss/ejb/plugins/EntityInstanceInterceptor.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/plugins/EntityInstanceInterceptor.java 2007-01-11 06:05:06 UTC (rev 59509)
+++ trunk/server/src/main/org/jboss/ejb/plugins/EntityInstanceInterceptor.java 2007-01-11 06:36:23 UTC (rev 59510)
@@ -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: trunk/server/src/main/org/jboss/ejb/plugins/EntityMultiInstanceInterceptor.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/plugins/EntityMultiInstanceInterceptor.java 2007-01-11 06:05:06 UTC (rev 59509)
+++ trunk/server/src/main/org/jboss/ejb/plugins/EntityMultiInstanceInterceptor.java 2007-01-11 06:36:23 UTC (rev 59510)
@@ -193,6 +193,7 @@
finally
{
AllowedOperationsAssociation.popInMethodFlag();
+ EnterpriseBeanPolicyContextHandler.setEnterpriseBean(null);
}
}
}
Modified: trunk/server/src/main/org/jboss/ejb/plugins/MessageDrivenInstanceInterceptor.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/plugins/MessageDrivenInstanceInterceptor.java 2007-01-11 06:05:06 UTC (rev 59509)
+++ trunk/server/src/main/org/jboss/ejb/plugins/MessageDrivenInstanceInterceptor.java 2007-01-11 06:36:23 UTC (rev 59510)
@@ -133,7 +133,8 @@
finally
{
AllowedOperationsAssociation.popInMethodFlag();
-
+ EnterpriseBeanPolicyContextHandler.setEnterpriseBean(null);
+
// Return context
if (mi.getEnterpriseContext() != null)
{
Modified: trunk/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java 2007-01-11 06:05:06 UTC (rev 59509)
+++ trunk/server/src/main/org/jboss/ejb/plugins/StatefulSessionInstanceInterceptor.java 2007-01-11 06:36:23 UTC (rev 59510)
@@ -397,6 +397,7 @@
container.getLockManager().removeLockRef(lock.getId());
if(!callerRunAsIdentityPresent)
SecurityActions.popSubjectContext();
+ EnterpriseBeanPolicyContextHandler.setEnterpriseBean(null);
}
}
Modified: trunk/server/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java 2007-01-11 06:05:06 UTC (rev 59509)
+++ trunk/server/src/main/org/jboss/ejb/plugins/StatelessSessionInstanceInterceptor.java 2007-01-11 06:36:23 UTC (rev 59510)
@@ -191,7 +191,8 @@
finally
{
AllowedOperationsAssociation.popInMethodFlag();
-
+ EnterpriseBeanPolicyContextHandler.setEnterpriseBean(null);
+
// Return context
if (mi.getEnterpriseContext() != null)
{
More information about the jboss-cvs-commits
mailing list