commit a31fbf480e4a1f72b543effb5a8dc177ce203a70
author Steven Laver <lavers@google.com> Mon Jan 06 13:24:39 2020 -0800
committer Steven Laver <lavers@google.com> Mon Jan 06 13:24:39 2020 -0800
tree 5d641155524e7cffb31ab74a20b9e8ec47f3de5a
parent 16cd945868576d84eff23ab5e55f58d516b3839d
parent 4537fa525006ff75a2914bc4c9652c9bdae8da03

Merge RP1A.200106.001

Change-Id: Ia16c1adbe47d05dd03176fab48289a786be3f487

internal/prefixmapper/src/com/google/i18n/phonenumbers/prefixmapper/PrefixFileReader.java

diff --git a/internal/prefixmapper/src/com/google/i18n/phonenumbers/prefixmapper/PrefixFileReader.java b/internal/prefixmapper/src/com/google/i18n/phonenumbers/prefixmapper/PrefixFileReader.java
index 8a4fde7..6642bff 100644
--- a/internal/prefixmapper/src/com/google/i18n/phonenumbers/prefixmapper/PrefixFileReader.java
+++ b/internal/prefixmapper/src/com/google/i18n/phonenumbers/prefixmapper/PrefixFileReader.java
@@ -65,11 +65,13 @@
   private PhonePrefixMap getPhonePrefixDescriptions(
       int prefixMapKey, String language, String script, String region) {
     String fileName = mappingFileProvider.getFileName(prefixMapKey, language, script, region);
-    if (fileName.length() == 0) {
-      return null;
-    }
-    if (!availablePhonePrefixMaps.containsKey(fileName)) {
-      loadPhonePrefixMapFromFile(fileName);
+    synchronized (PrefixFileReader.class) {
+      if (fileName.length() == 0) {
+        return null;
+      }
+      if (!availablePhonePrefixMaps.containsKey(fileName)) {
+        loadPhonePrefixMapFromFile(fileName);
+      }
     }
     return availablePhonePrefixMaps.get(fileName);
   }