make/jdk/src/classes/build/tools/cldrconverter/Bundle.java

*** 51,60 ****
--- 51,64 ----
          "NumberPatterns/decimal",
          "NumberPatterns/currency",
          "NumberPatterns/percent"
      };
  
+     private final static String[] COMPACT_NUMBER_PATTERN_KEYS = {
+             "short.CompactNumberPatterns",
+             "long.CompactNumberPatterns"};
+ 
      private final static String[] NUMBER_ELEMENT_KEYS = {
          "NumberElements/decimal",
          "NumberElements/group",
          "NumberElements/list",
          "NumberElements/percent",
*** 226,235 ****
--- 230,249 ----
                  myMap.put("NumberPatterns", numberPatterns);
                  break;
              }
          }
  
+         for (String k : COMPACT_NUMBER_PATTERN_KEYS) {
+             List<String> patterns = (List<String>) myMap.remove(k);
+             if (patterns != null) {
+                 // Replace any null entry with empty strings.
+                 String[] arrPatterns = patterns.stream()
+                         .map(s -> s == null ? "" : s).toArray(String[]::new);
+                 myMap.put(k, arrPatterns);
+             }
+         }
+ 
          // if myMap has any of NUMBER_ELEMENT_KEYS, create a complete NumberElements.
          String defaultScript = (String) myMap.get("DefaultNumberingSystem");
          @SuppressWarnings("unchecked")
          List<String> scripts = (List<String>) myMap.get("numberingScripts");
          if (defaultScript == null && scripts != null) {