diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2015-02-05 14:52:17 -0800 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2015-02-05 14:52:17 -0800 |
| commit | bd3573cb096cb8f0ec4bf29f0e11744a06a9e5a6 (patch) | |
| tree | 8114227aef1743eb20cdf6022fb1cebb9992c9d6 /javanano/src/test/java/com/google/protobuf/nano/map_test.proto | |
| parent | ca35a8030339d85cb4efb928b1aae8e38584d214 (diff) | |
Fix the behavior when merging conflicting keys, the new value always
override the existing one even for message types.
Diffstat (limited to 'javanano/src/test/java/com/google/protobuf/nano/map_test.proto')
| -rw-r--r-- | javanano/src/test/java/com/google/protobuf/nano/map_test.proto | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/javanano/src/test/java/com/google/protobuf/nano/map_test.proto b/javanano/src/test/java/com/google/protobuf/nano/map_test.proto index 5ea86717..f72833ad 100644 --- a/javanano/src/test/java/com/google/protobuf/nano/map_test.proto +++ b/javanano/src/test/java/com/google/protobuf/nano/map_test.proto @@ -38,6 +38,7 @@ option java_outer_classname = "MapTestProto"; message TestMap { message MessageValue { int32 value = 1; + int32 value2 = 2; } enum EnumValue { FOO = 0; |