Index: java/util/Currency.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/Currency.java,v retrieving revision 1.10 diff -u -3 -p -u -r1.10 Currency.java --- java/util/Currency.java 11 Jan 2005 16:36:03 -0000 1.10 +++ java/util/Currency.java 17 Jan 2005 00:51:54 -0000 @@ -304,10 +304,19 @@ public final class Currency /* Loop through each locale, looking for the code */ for (int i = 0;i < allLocales.length; i++) { - Currency testCurrency = getInstance (allLocales[i]); - if (testCurrency != null && - testCurrency.getCurrencyCode().equals(currencyCode)) - return testCurrency; + try + { + Currency testCurrency = getInstance (allLocales[i]); + if (testCurrency != null && + testCurrency.getCurrencyCode().equals(currencyCode)) + { + return testCurrency; + } + } + catch (IllegalArgumentException exception) + { + /* Ignore locales without valid countries */ + } } /* * If we get this far, the code is not supported by any of