This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 323630026c Fix missing strings
323630026c is described below
commit 323630026cff0814c7942ca1f654b4738d379da2
Author: remm <r...@apache.org>
AuthorDate: Tue Apr 5 16:24:04 2022 +0200
Fix missing strings
---
java/org/apache/catalina/core/DefaultInstanceManager.java | 4 ++--
java/org/apache/catalina/core/LocalStrings.properties | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/core/DefaultInstanceManager.java
b/java/org/apache/catalina/core/DefaultInstanceManager.java
index 588c367fac..931f8a3018 100644
--- a/java/org/apache/catalina/core/DefaultInstanceManager.java
+++ b/java/org/apache/catalina/core/DefaultInstanceManager.java
@@ -708,7 +708,7 @@ public class DefaultInstanceManager implements
InstanceManager {
if (method.getName().equals(methodNameFromXml)) {
if (!Introspection.isValidLifecycleCallback(method)) {
throw new IllegalArgumentException(
- "Invalid " + annotation.getName() + " annotation");
+
sm.getString("defaultInstanceManager.invalidAnnotation", annotation.getName()));
}
result = method;
}
@@ -716,7 +716,7 @@ public class DefaultInstanceManager implements
InstanceManager {
if (method.isAnnotationPresent(annotation)) {
if (currentMethod != null ||
!Introspection.isValidLifecycleCallback(method)) {
throw new IllegalArgumentException(
- "Invalid " + annotation.getName() + " annotation");
+
sm.getString("defaultInstanceManager.invalidAnnotation", annotation.getName()));
}
result = method;
}
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index 2ad9cc560f..d3739b6b66 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -123,6 +123,7 @@ containerBase.realm.stop=Error stopping old realm
containerBase.threadedStartFailed=A child container failed during start
containerBase.threadedStopFailed=A child container failed during stop
+defaultInstanceManager.invalidAnnotation=Invalid [{0}] annotation
defaultInstanceManager.invalidInjection=Invalid method resource injection
annotation
defaultInstanceManager.postConstructNotFound=Post construct method [{0}] for
class [{1}] is declared in deployment descriptor but cannot be found
defaultInstanceManager.preDestroyNotFound=Pre destroy method [{0}] for class
[{1}] is declared in deployment descriptor but cannot be found
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
