commit a1d3a5ed3af9cee85acdad939042a851a629f18c
author Shaopeng Jia <shaopengjia@google.com> Mon Sep 26 11:06:13 2011 +0200
committer Shaopeng Jia <shaopengjia@google.com> Mon Sep 26 11:06:13 2011 +0200
tree 29c26e2f1fbd3f7811386c8a26362e328ed6f4f1
parent 69a9689c7287e671d0aa263bebae97a9f406c5e4

Fix threading issue with PhoneNumberUtil.

Bug: 5354073
Change-Id: I6a37e714cc0587897f3bd9901cad730a91e2018f

java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java

diff --git a/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java b/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
index 2e1e9c8..745fb7d 100644
--- a/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
+++ b/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java
@@ -318,7 +318,8 @@
   private static PhoneNumberUtil instance = null;
 
   // A mapping from a region code to the PhoneMetadata for that region.
-  private Map<String, PhoneMetadata> regionToMetadataMap = new HashMap<String, PhoneMetadata>();
+  private final Map<String, PhoneMetadata> regionToMetadataMap =
+      Collections.synchronizedMap(new HashMap<String, PhoneMetadata>());
 
   // A cache for frequently used region-specific regular expressions.
   // As most people use phone numbers primarily from one to two countries, and there are roughly 60
@@ -1629,8 +1630,10 @@
     if (!isValidRegionCode(regionCode)) {
       return null;
     }
-    if (!regionToMetadataMap.containsKey(regionCode)) {
-      loadMetadataForRegionFromFile(currentFilePrefix, regionCode);
+    synchronized (regionToMetadataMap) {
+      if (!regionToMetadataMap.containsKey(regionCode)) {
+        loadMetadataForRegionFromFile(currentFilePrefix, regionCode);
+      }
     }
     return regionToMetadataMap.get(regionCode);
   }