Author: remy.maucherat(a)jboss.com Date: 2012-04-13 12:38:32 -0400 (Fri, 13 Apr 2012) New Revision: 2021 Modified: trunk/java/org/apache/catalina/core/ContainerBase.java trunk/webapps/docs/changelog.xml Log: Add a thread listener bind/unbind around the background processing. Modified: trunk/java/org/apache/catalina/core/ContainerBase.java =================================================================== --- trunk/java/org/apache/catalina/core/ContainerBase.java 2012-04-12 15:02:30 UTC (rev 2020) +++ trunk/java/org/apache/catalina/core/ContainerBase.java 2012-04-13 16:38:32 UTC (rev 2021) @@ -42,6 +42,7 @@ import org.apache.catalina.Container; import org.apache.catalina.ContainerEvent; import org.apache.catalina.ContainerListener; +import org.apache.catalina.Context; import org.apache.catalina.Globals; import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleException; @@ -1598,10 +1599,16 @@ Thread.currentThread().setContextClassLoader (container.getLoader().getClassLoader()); } + if (container instanceof Context) { + ((Context) container).getThreadBindingListener().bind(); + } container.backgroundProcess(); } catch (Throwable t) { log.error("Exception invoking periodic operation: ", t); } finally { + if (container instanceof Context) { + ((Context) container).getThreadBindingListener().unbind(); + } Thread.currentThread().setContextClassLoader(cl); } Container[] children = container.findChildren(); Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2012-04-12 15:02:30 UTC (rev 2020) +++ trunk/webapps/docs/changelog.xml 2012-04-13 16:38:32 UTC (rev 2021) @@ -37,6 +37,9 @@ <fix> <jboss-jira>AS7-4469</jboss-jira>: Fix SSL session id attribute name (standardized in Servlet 3). (remm) </fix> + <fix> + Use the thread listener bind/unbind in the background process. (remm) + </fix> </changelog> </subsection> <subsection name="Jasper">