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
commit 0ffbeee415bd3b722ec7f1bb9813a90365dcb636
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jul 23 16:18:26 2021 +0100
Look in correct package for i18n strings
---
java/org/apache/catalina/core/NamingContextListener.java | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/java/org/apache/catalina/core/NamingContextListener.java
b/java/org/apache/catalina/core/NamingContextListener.java
index 0845193..fe1be3b 100644
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -58,7 +58,6 @@ import org.apache.naming.ResourceLinkRef;
import org.apache.naming.ResourceRef;
import org.apache.naming.ServiceRef;
import org.apache.naming.TransactionRef;
-import org.apache.naming.factory.Constants;
import org.apache.naming.factory.ResourceLinkFactory;
import org.apache.tomcat.util.descriptor.web.ContextEjb;
import org.apache.tomcat.util.descriptor.web.ContextEnvironment;
@@ -85,6 +84,7 @@ public class NamingContextListener
implements LifecycleListener, ContainerListener, PropertyChangeListener {
private static final Log log =
LogFactory.getLog(NamingContextListener.class);
+ protected static final StringManager sm =
StringManager.getManager(NamingContextListener.class);
// ----------------------------------------------------- Instance Variables
@@ -148,13 +148,6 @@ public class NamingContextListener
private boolean exceptionOnFailedWrite = true;
- /**
- * The string manager for this package.
- */
- protected static final StringManager sm =
- StringManager.getManager(Constants.Package);
-
-
// ------------------------------------------------------------- Properties
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
