Author: kkolinko
Date: Wed Sep 11 00:27:48 2013
New Revision: 1521693
URL: http://svn.apache.org/r1521693
Log:
Merged r1521687 from tomcat/trunk:
Followup to r1514376.
Use value from local variable instead of repeating a method call.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1521687
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java?rev=1521693&r1=1521692&r2=1521693&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/res/StringManager.java Wed
Sep 11 00:27:48 2013
@@ -93,7 +93,7 @@ public class StringManager {
if (bundleLocale.equals(Locale.ROOT)) {
this.locale = Locale.ENGLISH;
} else {
- this.locale = bundle.getLocale();
+ this.locale = bundleLocale;
}
} else {
this.locale = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
