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 fe430a5912 Align with 11.0.x
fe430a5912 is described below
commit fe430a59129ebfa1f0e961db29faab8276b7f8df
Author: Mark Thomas <[email protected]>
AuthorDate: Sun Jan 15 17:13:31 2023 +0000
Align with 11.0.x
---
java/org/apache/jasper/runtime/PageContextImpl.java | 6 ++----
java/org/apache/juli/ClassLoaderLogManager.java | 12 ++----------
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/java/org/apache/jasper/runtime/PageContextImpl.java
b/java/org/apache/jasper/runtime/PageContextImpl.java
index 30476ab09a..5d2ecbd4e5 100644
--- a/java/org/apache/jasper/runtime/PageContextImpl.java
+++ b/java/org/apache/jasper/runtime/PageContextImpl.java
@@ -615,10 +615,8 @@ public class PageContextImpl extends PageContext {
request.setAttribute(PageContext.EXCEPTION, t);
request.setAttribute(RequestDispatcher.ERROR_STATUS_CODE,
Integer.valueOf(HttpServletResponse.SC_INTERNAL_SERVER_ERROR));
- request.setAttribute(RequestDispatcher.ERROR_REQUEST_URI,
- ((HttpServletRequest) request).getRequestURI());
- request.setAttribute(RequestDispatcher.ERROR_SERVLET_NAME,
- config.getServletName());
+ request.setAttribute(RequestDispatcher.ERROR_REQUEST_URI,
((HttpServletRequest) request).getRequestURI());
+ request.setAttribute(RequestDispatcher.ERROR_SERVLET_NAME,
config.getServletName());
try {
forward(errorPageURL);
} catch (IllegalStateException ise) {
diff --git a/java/org/apache/juli/ClassLoaderLogManager.java
b/java/org/apache/juli/ClassLoaderLogManager.java
index b4ab262601..588146e6b2 100644
--- a/java/org/apache/juli/ClassLoaderLogManager.java
+++ b/java/org/apache/juli/ClassLoaderLogManager.java
@@ -305,24 +305,16 @@ public class ClassLoaderLogManager extends LogManager {
}
@Override
- public void readConfiguration()
- throws IOException, SecurityException {
-
+ public void readConfiguration() throws IOException, SecurityException {
checkAccess();
-
readConfiguration(getClassLoader());
-
}
@Override
- public void readConfiguration(InputStream is)
- throws IOException, SecurityException {
-
+ public void readConfiguration(InputStream is) throws IOException,
SecurityException {
checkAccess();
reset();
-
readConfiguration(is, getClassLoader());
-
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
