Merge pull request #2357 from D3Hunter/master

#2356 : fix ExceptionInInitializerError on IBM J9
8 years ago · df56736db9
parent df8390790a ed08341234
commit df56736db9
1 changed files with 1 additions and 1 deletions
--- a/java/core/src/main/java/com/google/protobuf/MapFieldLite.java
+++ b/java/core/src/main/java/com/google/protobuf/MapFieldLite.java
@ -58,7 +58,7 @@ public final class MapFieldLite<K, V> extends LinkedHashMap<K, V> {
  }

  @SuppressWarnings({"rawtypes", "unchecked"})
-  private static final MapFieldLite EMPTY_MAP_FIELD = new MapFieldLite(Collections.emptyMap());
+  private static final MapFieldLite EMPTY_MAP_FIELD = new MapFieldLite();
  static {
    EMPTY_MAP_FIELD.makeImmutable();
  }