sebb 2005/06/18 16:33:10
Modified: src/core/org/apache/jmeter/util JMeterUtils.java
Log:
Need to restore locale afterwards
Revision Changes Path
1.74 +17 -7
jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java
Index: JMeterUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- JMeterUtils.java 18 Jun 2005 23:19:47 -0000 1.73
+++ JMeterUtils.java 18 Jun 2005 23:33:09 -0000 1.74
@@ -250,17 +250,27 @@
* before it defaults to the base property file, so we need to change
* the default Locale to ensure the base property file is found.
*/
- if(loc.getLanguage() == Locale.ENGLISH.getLanguage()
- && // Don't change locale from en_GB to en
- Locale.getDefault().getLanguage() != Locale.ENGLISH.getLanguage()
- ) {
- Locale.setDefault(Locale.ENGLISH);
+ Locale def = null;
+ if(loc.getLanguage() == Locale.ENGLISH.getLanguage()){
+ def = Locale.getDefault();
+ // Don't change locale from en_GB to en
+ if (def.getLanguage() != Locale.ENGLISH.getLanguage()) {
+ Locale.setDefault(Locale.ENGLISH);
+ } else {
+ def = null; // no need to reset Locale
+ }
}
resources =
ResourceBundle.getBundle(
"org.apache.jmeter.resources.messages",
locale);
notifyLocaleChangeListeners();
+ /*
+ * Reset Locale if necessary so other locales are properly handled
+ */
+ if (def != null) {
+ Locale.setDefault(def);
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
