AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-8854 Possible null pointer dereference.

Browse Source 
X-SVN-Rev: 30936
This commit is contained in:
Abhinav Gupta 2011-11-07 16:36:22 +00:00
parent 073babced5
commit 8ec0200596
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
icu4j/main/classes/core/src/com/ibm/icu/impl/ZoneMeta.java
View File

@ -351,7 +351,7 @@ public final class ZoneMeta {
* the id itself. If the given tzid is not known, return null.
*
* Note: This internal API supports all known system IDs and "Etc/Unknown" (which is
* NOT a sysmte ID).
* NOT a system ID).
*/
public static String getCanonicalCLDRID(String tzid) {
String canonical = CANONICAL_ID_CACHE.get(tzid);
@ -377,9 +377,11 @@ public final class ZoneMeta {
ICUResourceBundle.ICU_BASE_NAME, "keyTypeData", ICUResourceBundle.ICU_DATA_CLASS_LOADER);
UResourceBundle typeAlias = keyTypeData.get("typeAlias");
UResourceBundle aliasesForKey = typeAlias.get("timezone");
String cldrCanonical = aliasesForKey.getString(canonical.replace('/', ':'));
if (cldrCanonical != null) {
canonical = cldrCanonical;
if (canonical != null) {
String cldrCanonical = aliasesForKey.getString(canonical.replace('/', ':'));
if (cldrCanonical != null) {
canonical = cldrCanonical;
}
}
} catch (MissingResourceException e) {
// fall through