This is an automated email from the ASF dual-hosted git repository. remm pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push: new 19c5d56 Fix some missed i18n 19c5d56 is described below commit 19c5d56066b21625b1595c0fa702680cd3bd4f6e Author: remm <r...@apache.org> AuthorDate: Wed Jul 10 01:20:47 2019 +0200 Fix some missed i18n --- java/org/apache/naming/factory/FactoryBase.java | 12 +++++++----- java/org/apache/naming/factory/LocalStrings.properties | 4 ++++ java/org/apache/naming/factory/ResourceFactory.java | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/java/org/apache/naming/factory/FactoryBase.java b/java/org/apache/naming/factory/FactoryBase.java index ee5510e..a49c4b1 100644 --- a/java/org/apache/naming/factory/FactoryBase.java +++ b/java/org/apache/naming/factory/FactoryBase.java @@ -25,12 +25,16 @@ import javax.naming.RefAddr; import javax.naming.Reference; import javax.naming.spi.ObjectFactory; +import org.apache.naming.StringManager; + /** * Abstract base class that provides common functionality required by * sub-classes. This class exists primarily to reduce code duplication. */ public abstract class FactoryBase implements ObjectFactory { + private static final StringManager sm = StringManager.getManager(FactoryBase.class); + /** * Creates a new object instance. * @@ -63,8 +67,7 @@ public abstract class FactoryBase implements ObjectFactory { factoryClass = Class.forName(factoryClassName); } } catch(ClassNotFoundException e) { - NamingException ex = new NamingException( - "Could not load resource factory class"); + NamingException ex = new NamingException(sm.getString("factoryBase.factoryClassError")); ex.initCause(e); throw ex; } @@ -80,8 +83,7 @@ public abstract class FactoryBase implements ObjectFactory { if (t instanceof VirtualMachineError) { throw (VirtualMachineError) t; } - NamingException ex = new NamingException( - "Could not create resource factory instance"); + NamingException ex = new NamingException(sm.getString("factoryBase.factoryCreationError")); ex.initCause(t); throw ex; } @@ -93,7 +95,7 @@ public abstract class FactoryBase implements ObjectFactory { if (factory != null) { return factory.getObjectInstance(obj, name, nameCtx, environment); } else { - throw new NamingException("Cannot create resource instance"); + throw new NamingException(sm.getString("factoryBase.instanceCreationError")); } } diff --git a/java/org/apache/naming/factory/LocalStrings.properties b/java/org/apache/naming/factory/LocalStrings.properties index df6376b..692cef2 100644 --- a/java/org/apache/naming/factory/LocalStrings.properties +++ b/java/org/apache/naming/factory/LocalStrings.properties @@ -15,6 +15,10 @@ dataSourceLinkFactory.badWrapper=Not a wrapper for type [{0}] +factoryBase.factoryClassError=Could not load resource factory class +factoryBase.factoryCreationError=Could not create resource factory instance +factoryBase.instanceCreationError=Could not create resource instance + lookupFactory.circularReference=Found a circular reference involving [{0}] lookupFactory.createFailed=Could not create instance of JNDI lookup factory class lookupFactory.loadFailed=Could not load JNDI lookup factory class diff --git a/java/org/apache/naming/factory/ResourceFactory.java b/java/org/apache/naming/factory/ResourceFactory.java index 44ca509..a458315 100644 --- a/java/org/apache/naming/factory/ResourceFactory.java +++ b/java/org/apache/naming/factory/ResourceFactory.java @@ -30,7 +30,7 @@ import org.apache.naming.StringManager; */ public class ResourceFactory extends FactoryBase { - private static final StringManager sm = StringManager.getManager(ResourceLinkFactory.class); + private static final StringManager sm = StringManager.getManager(ResourceFactory.class); @Override protected boolean isReferenceTypeSupported(Object obj) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org