This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 0ac33836c3 Fix Bug 66543 - Wrong log message used in
StandardContext#fireRequestDestroyEvent
0ac33836c3 is described below
commit 0ac33836c37dda486842b2d2ec4446ac112452ff
Author: Felix Schumacher <[email protected]>
AuthorDate: Sat Mar 25 13:12:38 2023 +0100
Fix Bug 66543 - Wrong log message used in
StandardContext#fireRequestDestroyEvent
Give it its own log message instead of re-using the one from
fireRequestInitEvent.
---
java/org/apache/catalina/core/LocalStrings.properties | 1 +
java/org/apache/catalina/core/StandardContext.java | 2 +-
webapps/docs/changelog.xml | 4 ++++
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index e4438c7556..7988653de3 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -209,6 +209,7 @@ standardContext.predestroy.duplicate=Duplicate @PreDestroy
method definition for
standardContext.predestroy.required=Both fully qualified class name and method
name are required
standardContext.reloadingCompleted=Reloading Context with name [{0}] is
completed
standardContext.reloadingStarted=Reloading Context with name [{0}] has started
+standardContext.requestListener.requestDestroyed=Exception sending request
destroyed lifecycle event to listener instance of class [{0}]
standardContext.requestListener.requestInit=Exception sending request
initialized lifecycle event to listener instance of class [{0}]
standardContext.resourcesInit=Error initializing static Resources
standardContext.resourcesStart=Error starting static Resources
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index 21ac22928b..446ab1a686 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -5629,7 +5629,7 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
listener.requestDestroyed(event);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
-
getLogger().error(sm.getString("standardContext.requestListener.requestInit",
+
getLogger().error(sm.getString("standardContext.requestListener.requestDestroyed",
instances[j].getClass().getName()), t);
request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, t);
return false;
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2117f1cda9..d2b3516a80 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -180,6 +180,10 @@
application, avoid <code>ClassNotFoundException</code>s when validating
session IDs extracted from requests. (markt)
</fix>
+ <fix>
+ <bug>66543</bug>: Give
<code>StandardContext#fireRequestDestroyEvent</code>
+ its own log message. (fschumacher)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
