Author: markt Date: Thu Aug 15 16:56:01 2013 New Revision: 1514368 URL: http://svn.apache.org/r1514368 Log: Fix issue reported on users list. Because the default bundle reports as the ROOT locale rather than as ENGLISH, the request locale to resource bundle mapping failed.
Modified: tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java Modified: tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java?rev=1514368&r1=1514367&r2=1514368&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java Thu Aug 15 16:56:01 2013 @@ -89,7 +89,12 @@ public class StringManager { bundle = bnd; // Get the actual locale, which may be different from the requested one if (bundle != null) { - this.locale = bundle.getLocale(); + Locale bundleLocale = bundle.getLocale(); + if (bundleLocale.equals(Locale.ROOT)) { + this.locale = Locale.ENGLISH; + } else { + this.locale = bundle.getLocale(); + } } else { this.locale = null; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org