JAVA: Fix a small threading issue with PhoneNumberUtil.java

Review URL: http://codereview.appspot.com/5129044

git-svn-id: http://libphonenumber.googlecode.com/svn/trunk@359 ee073f10-1060-11df-b6a4-87a95322a99c

diff --git a/java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
index acca382b4736f5db5943ded32166e38f6becef39..27782312f3cb5b80e7448edacafe43fe9a971017 100644 (file)
--- a/java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
+++ b/java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
@@ -318,7 +318,8 @@ public class PhoneNumberUtil {
   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 @@ public class PhoneNumberUtil {
     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);
   }