diff options
author | Jisi Liu <jisi.liu@gmail.com> | 2015-02-07 12:51:36 -0800 |
---|---|---|
committer | Jisi Liu <jisi.liu@gmail.com> | 2015-02-07 12:51:36 -0800 |
commit | 12d8a514c84ee8d60e5d8b8b84aa09dad15197f2 (patch) | |
tree | ea00ee660534aff8cb321aa7f9a7d0a5b11227ae /javanano/src/main/java/com | |
parent | d9a6f27bc333587fad88b3bc1f53b370a016ccd0 (diff) | |
download | protobuf-12d8a514c84ee8d60e5d8b8b84aa09dad15197f2.tar.gz protobuf-12d8a514c84ee8d60e5d8b8b84aa09dad15197f2.tar.bz2 protobuf-12d8a514c84ee8d60e5d8b8b84aa09dad15197f2.zip |
Get the map factory per mergeFrom() call for JavaNano.
Diffstat (limited to 'javanano/src/main/java/com')
-rw-r--r-- | javanano/src/main/java/com/google/protobuf/nano/InternalNano.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/javanano/src/main/java/com/google/protobuf/nano/InternalNano.java b/javanano/src/main/java/com/google/protobuf/nano/InternalNano.java index f3144652..c92ec417 100644 --- a/javanano/src/main/java/com/google/protobuf/nano/InternalNano.java +++ b/javanano/src/main/java/com/google/protobuf/nano/InternalNano.java @@ -30,6 +30,8 @@ package com.google.protobuf.nano; +import com.google.protobuf.nano.MapFactories.MapFactory; + import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.Arrays; @@ -406,12 +408,13 @@ public final class InternalNano { public static final <K, V> Map<K, V> mergeMapEntry( CodedInputByteBufferNano input, Map<K, V> map, + MapFactory mapFactory, int keyType, int valueType, V value, int keyTag, int valueTag) throws IOException { - map = MapFactories.getMapFactory().forMap(map); + map = mapFactory.forMap(map); final int length = input.readRawVarint32(); final int oldLimit = input.pushLimit(length); K key = null; |