This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 6b3ffe05d2 Fix backport - 10.1.x and earlier support a SecurityManager
6b3ffe05d2 is described below
commit 6b3ffe05d2b05961cb3b47d1c1f6fc98a9869b83
Author: Mark Thomas <[email protected]>
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 d64b79584e..75c24acd02 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -2501,7 +2501,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) {
@@ -2536,7 +2536,7 @@ public class Request implements HttpServletRequest {
return true;
} finally {
- context.unbind(originalClassLoader);
+ context.unbind(Globals.IS_SECURITY_ENABLED, originalClassLoader);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
