From ceb60561d4c1721ec106bfc42204381451c07e4e Mon Sep 17 00:00:00 2001
From: John Emmons <emmo@us.ibm.com>
Date: Sat, 3 Oct 2009 03:56:15 +0000
Subject: [PATCH] ICU-7173 Merge CLDR 1.8p1 data from branch

X-SVN-Rev: 26735
---
 .../core/src/com/ibm/icu/impl/ICUResourceBundle.java  | 11 ++++-------
 icu4j/main/shared/data/icudata.jar                    |  4 ++--
 icu4j/main/shared/data/testdata.jar                   |  4 ++--
 .../com/ibm/icu/dev/test/util/DebugUtilitiesData.java |  4 ++--
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/ICUResourceBundle.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/ICUResourceBundle.java
index bddd875b69..fed200a8a1 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/ICUResourceBundle.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/ICUResourceBundle.java
@@ -783,21 +783,18 @@ public  class ICUResourceBundle extends UResourceBundle {
 
                 b = (ICUResourceBundle)addToCache(root, fullName, defaultLocale, b);
 
-                boolean ParentIsRoot;
-                try {
-                    b.get("%%ParentIsRoot");
+                boolean ParentIsRoot = false;
+                if (b.getTableResource("%%ParentIsRoot") != RES_BOGUS) {
                     ParentIsRoot = true;
-                } catch (MissingResourceException ex) {
-                    ParentIsRoot = false;
                 }
 
                 if (i != -1 && !ParentIsRoot) {
                     parent = instantiateBundle(baseName, localeName.substring(0, i), root, disableFallback);
-                }else if(!localeName.equals(rootLocale)){
+                } else if (!localeName.equals(rootLocale)){
                     parent = instantiateBundle(baseName, rootLocale, root, true);
                 }
 
-                if(!b.equals(parent)){
+                if (!b.equals(parent)){
                     b.setParent(parent);
                 }
             }
diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
index 358ea6c6d9..083843da6e 100755
--- a/icu4j/main/shared/data/icudata.jar
+++ b/icu4j/main/shared/data/icudata.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:789d219e5096b85eaa00b7826504fdf40247afd343ea89346b1c458c33e7ad74
-size 6408961
+oid sha256:9d0750cfdc01d9d3c6fc8718ba263bb017406fd98c38ed8dd672949f8e6c643a
+size 6466881
diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar
index 073f58a023..152e1e6b26 100755
--- a/icu4j/main/shared/data/testdata.jar
+++ b/icu4j/main/shared/data/testdata.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ff60c10bffa9b19ad3e4a6dcc2d2415e45d4fdb6ac8133c0d673ecf0b75ffc74
-size 720071
+oid sha256:19cbe9dc7cb7e87c559d5afd674094c76a19389a70b208301ef54d48b37fc8a7
+size 720100
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java
index 377870f9a1..ef9d8bd1b4 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/DebugUtilitiesData.java
@@ -5,7 +5,7 @@
 package com.ibm.icu.dev.test.util;
 
 public class DebugUtilitiesData extends Object {
-    public static final String ICU4C_VERSION="4.2";
+    public static final String ICU4C_VERSION="4.3.2";
     public static final int UDebugEnumType = 0;
     public static final int UCalendarDateFields = 1;
     public static final int UCalendarMonths = 2;
@@ -136,7 +136,7 @@ public class DebugUtilitiesData extends Object {
            com.ibm.icu.util.Calendar.EXTENDED_YEAR, /* 19 */
            com.ibm.icu.util.Calendar.JULIAN_DAY, /* 20 */
            com.ibm.icu.util.Calendar.MILLISECONDS_IN_DAY, /* 21 */
-           com.ibm.icu.util.Calendar.IS_LEAP_MONTH, /* 22 */
+           com.ibm.icu.util.ChineseCalendar.IS_LEAP_MONTH, /* 22 */
         },
         /* UCalendarMonths, 2 */
         {