[tomcat] branch 10.1.x updated: Fix previous merge. Missed a few changes.

[markt]

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

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


The following commit(s) were added to refs/heads/10.1.x by this push:
     new c2f36c205f Fix previous merge. Missed a few changes.
c2f36c205f is described below

commit c2f36c205f4c726a3b14743c5ab8550e654e7c8c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Feb 24 15:26:22 2023 +0000

    Fix previous merge. Missed a few changes.
---
 java/org/apache/catalina/servlets/DefaultServlet.java     | 4 ++--
 java/org/apache/jasper/compiler/JspDocumentParser.java    | 5 ++---
 java/org/apache/jasper/compiler/TagPluginManager.java     | 2 +-
 java/org/apache/tomcat/util/descriptor/tld/TldParser.java | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java 
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 8e9ad45ceb..879b6b8dc9 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1719,14 +1719,14 @@ public class DefaultServlet extends HttpServlet {
             PrivilegedGetTccl pa = new PrivilegedGetTccl(currentThread);
             original = AccessController.doPrivileged(pa);
         } else {
-            original = Thread.currentThread().getContextClassLoader();
+            original = currentThread.getContextClassLoader();
         }
         try {
             if (Globals.IS_SECURITY_ENABLED) {
                 PrivilegedSetTccl pa = new PrivilegedSetTccl(currentThread, 
DefaultServlet.class.getClassLoader());
                 AccessController.doPrivileged(pa);
             } else {
-                Thread.currentThread().setContextClassLoader(
+                currentThread.setContextClassLoader(
                         DefaultServlet.class.getClassLoader());
             }
 
diff --git a/java/org/apache/jasper/compiler/JspDocumentParser.java 
b/java/org/apache/jasper/compiler/JspDocumentParser.java
index a068dcfdfd..085ba694c4 100644
--- a/java/org/apache/jasper/compiler/JspDocumentParser.java
+++ b/java/org/apache/jasper/compiler/JspDocumentParser.java
@@ -1462,15 +1462,14 @@ class JspDocumentParser
             PrivilegedGetTccl pa = new PrivilegedGetTccl(currentThread);
             original = AccessController.doPrivileged(pa);
         } else {
-            original = Thread.currentThread().getContextClassLoader();
+            original = currentThread.getContextClassLoader();
         }
         try {
             if (Constants.IS_SECURITY_ENABLED) {
                 PrivilegedSetTccl pa = new PrivilegedSetTccl(currentThread, 
JspDocumentParser.class.getClassLoader());
                 AccessController.doPrivileged(pa);
             } else {
-                Thread.currentThread().setContextClassLoader(
-                        JspDocumentParser.class.getClassLoader());
+                
currentThread.setContextClassLoader(JspDocumentParser.class.getClassLoader());
             }
 
             SAXParserFactory factory = SAXParserFactory.newInstance();
diff --git a/java/org/apache/jasper/compiler/TagPluginManager.java 
b/java/org/apache/jasper/compiler/TagPluginManager.java
index 05efec1270..8925ca8221 100644
--- a/java/org/apache/jasper/compiler/TagPluginManager.java
+++ b/java/org/apache/jasper/compiler/TagPluginManager.java
@@ -82,7 +82,7 @@ public class TagPluginManager {
             PrivilegedGetTccl pa = new PrivilegedGetTccl(currentThread);
             original = AccessController.doPrivileged(pa);
         } else {
-            original = Thread.currentThread().getContextClassLoader();
+            original = currentThread.getContextClassLoader();
         }
         try {
             if (Constants.IS_SECURITY_ENABLED) {
diff --git a/java/org/apache/tomcat/util/descriptor/tld/TldParser.java 
b/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
index b19917c3f3..933a13c1ca 100644
--- a/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
+++ b/java/org/apache/tomcat/util/descriptor/tld/TldParser.java
@@ -57,7 +57,7 @@ public class TldParser {
             PrivilegedGetTccl pa = new PrivilegedGetTccl(currentThread);
             original = AccessController.doPrivileged(pa);
         } else {
-            original = Thread.currentThread().getContextClassLoader();
+            original = currentThread.getContextClassLoader();
         }
         try (InputStream is = path.openStream()) {
             if (Constants.IS_SECURITY_ENABLED) {


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