From 985e3c1564f65598ddd9bb439928efdcb5db218f Mon Sep 17 00:00:00 2001
From: yhuang <unknown>
Date: Sun, 20 Dec 2009 19:49:30 -0800
Subject: [PATCH] 6573250: Java.util.Currency.getSymbol(Locale) returns wrong
 value when locale is not US. Reviewed-by: yhuang, peytoia

---
 .../classes/sun/util/resources/CurrencyNames_en_CA.properties  | 1 +
 test/sun/text/resources/LocaleData                             | 3 +++
 test/sun/text/resources/LocaleDataTest.java                    | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/share/classes/sun/util/resources/CurrencyNames_en_CA.properties b/src/share/classes/sun/util/resources/CurrencyNames_en_CA.properties
index 62c976ff1..e902e799d 100644
--- a/src/share/classes/sun/util/resources/CurrencyNames_en_CA.properties
+++ b/src/share/classes/sun/util/resources/CurrencyNames_en_CA.properties
@@ -36,3 +36,4 @@
 # Taligent is a registered trademark of Taligent, Inc.
 
 CAD=$
+USD=US$
diff --git a/test/sun/text/resources/LocaleData b/test/sun/text/resources/LocaleData
index 4268d7548..bb6dbdaa2 100644
--- a/test/sun/text/resources/LocaleData
+++ b/test/sun/text/resources/LocaleData
@@ -5577,3 +5577,6 @@ FormatData/lt/DateTimePatterns/6=yyyy-MM-dd
 
 #bug 6910489
 CalendarData/sl/firstDayOfWeek=2
+
+# bug 6573250
+CurrencyNames/en_CA/USD=US$
diff --git a/test/sun/text/resources/LocaleDataTest.java b/test/sun/text/resources/LocaleDataTest.java
index fc869d967..b585a5278 100644
--- a/test/sun/text/resources/LocaleDataTest.java
+++ b/test/sun/text/resources/LocaleDataTest.java
@@ -32,7 +32,7 @@
  *      6414459 6455680 6498742 6558863 6488119 6547501 6497154 6558856 6481177
  *      6379214 6485516 6486607 4225362 4494727 6533691 6531591 6531593 6570259
  *      6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611
- *      6645405 6650730 6910489
+ *      6645405 6650730 6910489 6573250
  * @summary Verify locale data
  *
  */
-- 
GitLab