Am 2021-11-28 um 14:42 schrieb ma...@apache.org:
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 417e339 Revert incorrect change in 4896083
417e339 is described below
commit 417e3396a44efd71c16b2494c4840f8b347ecf7b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sun Nov 28 13:42:24 2021 +0000
Revert incorrect change in 4896083
---
.../org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
b/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
index e34c91f..bddec0c 100644
--- a/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
+++ b/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
@@ -65,8 +65,8 @@ public class StoreConfigLifecycleListener implements
LifecycleListener {
if (event.getSource() instanceof Server) {
createMBean((Server) event.getSource());
} else {
- log.warn("This listener must only be nested within Server elements,
but is in [" +
- event.getLifecycle().getClass().getSimpleName() +
"].");
+ log.warn(sm.getString("storeConfigListener.notServer",
+ event.getLifecycle().getClass().getSimpleName()));
This is now incorrect as well. Look at
https://github.com/apache/tomcat/blob/48960832ca7e5c6da77d2fb83548e4f92fb37040/java/org/apache/catalina/storeconfig/LocalStrings.properties#L22.
There is no placeholder.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
