From: Shane Carr <shane@unicode.org>
Date: Thu, 5 Oct 2017 22:32:41 +0000 (+0000)
Subject: ICU-13368 Fixing serialization test failure caused by r40561.
X-Git-Tag: release-60-rc~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f0e9b357c29b3cf5102261596609e901ea847c72;p=icu

ICU-13368 Fixing serialization test failure caused by r40561.

X-SVN-Rev: 40574
---

diff --git a/icu4j/main/classes/currdata/src/com/ibm/icu/impl/ICUCurrencyDisplayInfoProvider.java b/icu4j/main/classes/currdata/src/com/ibm/icu/impl/ICUCurrencyDisplayInfoProvider.java
index e69f2a6052f..b0fe8de7694 100644
--- a/icu4j/main/classes/currdata/src/com/ibm/icu/impl/ICUCurrencyDisplayInfoProvider.java
+++ b/icu4j/main/classes/currdata/src/com/ibm/icu/impl/ICUCurrencyDisplayInfoProvider.java
@@ -33,6 +33,8 @@ public class ICUCurrencyDisplayInfoProvider implements CurrencyDisplayInfoProvid
 
     @Override
     public CurrencyDisplayInfo getInstance(ULocale locale, boolean withFallback) {
+        // Make sure the locale is non-null (this can happen during deserialization):
+        if (locale == null) { locale = ULocale.ROOT; }
         ICUCurrencyDisplayInfo instance = currencyDisplayInfoCache;
         if (instance == null || !instance.locale.equals(locale) || instance.fallback != withFallback) {
             ICUResourceBundle rb;