Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50629

Make StandardContext.bindThread() and StandardContext.unbindThread() protected to allow use by sub-classes.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1061797 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index c2e5b97..0556cdd 100644 (file)
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -5547,16 +5547,13 @@ public class StandardContext extends ContainerBase
     }
 
 
-    // -------------------------------------------------------- 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 ContainerBase
     /**
      * Unbind thread.
      */
-    private void unbindThread(ClassLoader oldContextClassLoader) {
+    protected void unbindThread(ClassLoader oldContextClassLoader) {
 
         if (isUseNaming()) {
             ContextBindings.unbindThread(this, this);

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 204cdbd..31f27e2 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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">