This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
     new d2ee6bfc2d Fix backport - 10.1.x and earlier support a SecurityManager
d2ee6bfc2d is described below

commit d2ee6bfc2dda584f1c5b9fe5eca4086fa844b20c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sun Mar 26 20:55:23 2023 +0100

    Fix backport - 10.1.x and earlier support a SecurityManager
---
 java/org/apache/catalina/connector/Request.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/connector/Request.java 
b/java/org/apache/catalina/connector/Request.java
index 41fddef382..666c67ef4c 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -2487,7 +2487,7 @@ public class Request implements HttpServletRequest {
          * As per PR #594, the manager could be provided by the web 
application and calls to findSession() could trigger
          * class loading so set the thread context class loader appropriately 
to avoid ClassNotFoundException.
          */
-        ClassLoader originalClassLoader = context.bind(null);
+        ClassLoader originalClassLoader = 
context.bind(Globals.IS_SECURITY_ENABLED, null);
         try {
             Manager manager = context.getManager();
             if (manager == null) {
@@ -2522,7 +2522,7 @@ public class Request implements HttpServletRequest {
 
             return true;
         } finally {
-            context.unbind(originalClassLoader);
+            context.unbind(Globals.IS_SECURITY_ENABLED, originalClassLoader);
         }
     }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to