Index: java/text/DecimalFormatSymbols.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/text/DecimalFormatSymbols.java,v retrieving revision 1.16 diff -u -3 -p -u -r1.16 DecimalFormatSymbols.java --- java/text/DecimalFormatSymbols.java 11 Jan 2005 16:36:03 -0000 1.16 +++ java/text/DecimalFormatSymbols.java 12 Jan 2005 23:32:19 -0000 @@ -132,6 +132,12 @@ public final class DecimalFormatSymbols /** * This method initializes a new instance of * DecimalFormatSymbols for the specified locale. + * Note: if the locale does not have an associated + * Currency instance, the currency symbol and + * international currency symbol will be set to the strings "?" + * and "XXX" respectively. This generally happens with language + * locales (those with no specified country), such as + * Locale.ENGLISH. * * @param locale The local to load symbols for. * @throws NullPointerException if the locale is null. @@ -141,8 +147,8 @@ public final class DecimalFormatSymbols ResourceBundle res; currency = null; - currencySymbol = ""; - intlCurrencySymbol = ""; + currencySymbol = "?"; + intlCurrencySymbol = "XXX"; try { res = ResourceBundle.getBundle("gnu.java.locale.LocaleInformation", @@ -154,9 +160,7 @@ public final class DecimalFormatSymbols } try { - Currency localeCurrency; - - localeCurrency = Currency.getInstance(loc); + Currency localeCurrency = Currency.getInstance(loc); if (localeCurrency != null) { setCurrency(localeCurrency);