Author: remy.maucherat(a)jboss.com Date: 2012-04-13 18:34:05 -0400 (Fri, 13 Apr 2012) New Revision: 2023 Modified: branches/7.0.x/java/org/apache/catalina/core/ContainerBase.java Log: Port patch: use the thread listener bind/unbind on the background process. Modified: branches/7.0.x/java/org/apache/catalina/core/ContainerBase.java =================================================================== --- branches/7.0.x/java/org/apache/catalina/core/ContainerBase.java 2012-04-13 22:31:25 UTC (rev 2022) +++ branches/7.0.x/java/org/apache/catalina/core/ContainerBase.java 2012-04-13 22:34:05 UTC (rev 2023) @@ -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();