diff options
author | Feng Xiao <xiaofeng@google.com> | 2016-11-11 10:45:54 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-11 10:45:54 -0800 |
commit | df56736db9b00a6539d19724b89467b167003cb0 (patch) | |
tree | efb8f36cbd770921224c9ec3cda7770719f25414 | |
parent | df8390790aae6025e95687a37eea81a4757966d0 (diff) | |
parent | ed0834123490d259ede8d52c34629be588dcd3f2 (diff) |
Merge pull request #2357 from D3Hunter/master
#2356 : fix ExceptionInInitializerError on IBM J9
-rw-r--r-- | java/core/src/main/java/com/google/protobuf/MapFieldLite.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/core/src/main/java/com/google/protobuf/MapFieldLite.java b/java/core/src/main/java/com/google/protobuf/MapFieldLite.java index 3c0ad89a..16b3fefe 100644 --- 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(); } |