Author: markt
Date: Fri Jan 21 13:17:12 2011
New Revision: 1061797
URL: http://svn.apache.org/viewvc?rev=1061797&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50629
Make StandardContext.bindThread() and StandardContext.unbindThread() protected
to allow use by sub-classes.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1061797&r1=1061796&r2=1061797&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Fri Jan 21
13:17:12 2011
@@ -5547,16 +5547,13 @@ public class StandardContext extends Con
}
- // -------------------------------------------------------- Private Methods
-
-
/**
* Bind current thread, both for CL purposes and for JNDI ENC support
* during : startup, shutdown and realoading of the context.
*
* @return the previous context class loader
*/
- private ClassLoader bindThread() {
+ protected ClassLoader bindThread() {
ClassLoader oldContextClassLoader =
Thread.currentThread().getContextClassLoader();
@@ -5588,7 +5585,7 @@ public class StandardContext extends Con
/**
* Unbind thread.
*/
- private void unbindThread(ClassLoader oldContextClassLoader) {
+ protected void unbindThread(ClassLoader oldContextClassLoader) {
if (isUseNaming()) {
ContextBindings.unbindThread(this, this);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1061797&r1=1061796&r2=1061797&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jan 21 13:17:12 2011
@@ -83,6 +83,11 @@
<code>Session.endAccess()</code> from preventing the normal completion
of <code>Request.recycle()</code>. (markt)
</fix>
+ <fix>
+ <bug>50629</bug>: Make <code>StandardContext.bindThread()</code> and
+ <code>StandardContext.unbindThread()</code> protected to allow use by
+ sub-classes. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
