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 /src/google/protobuf/compiler/javanano/javanano_message.cc | |
| parent | d9a6f27bc333587fad88b3bc1f53b370a016ccd0 (diff) | |
Get the map factory per mergeFrom() call for JavaNano.
Diffstat (limited to 'src/google/protobuf/compiler/javanano/javanano_message.cc')
| -rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_message.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_message.cc b/src/google/protobuf/compiler/javanano/javanano_message.cc index 5454d9be..da7c656f 100644 --- a/src/google/protobuf/compiler/javanano/javanano_message.cc +++ b/src/google/protobuf/compiler/javanano/javanano_message.cc @@ -345,6 +345,11 @@ void MessageGenerator::GenerateMergeFromMethods(io::Printer* printer) { "classname", descriptor_->name()); printer->Indent(); + if (HasMapField(descriptor_)) { + printer->Print( + "com.google.protobuf.nano.MapFactories.MapFactory mapFactory =\n" + " com.google.protobuf.nano.MapFactories.getMapFactory();\n"); + } printer->Print( "while (true) {\n"); |