From 9e4f354f14775061ed098c896170d3a2d01a3895 Mon Sep 17 00:00:00 2001 From: Jon Skeet Date: Mon, 4 Jan 2016 14:03:01 +0000 Subject: Prohibit null values in map fields On deserialization, missing values for message types are replaced with a "default" message. --- src/google/protobuf/compiler/csharp/csharp_map_field.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/google') diff --git a/src/google/protobuf/compiler/csharp/csharp_map_field.cc b/src/google/protobuf/compiler/csharp/csharp_map_field.cc index b493495d..15c68b3f 100644 --- a/src/google/protobuf/compiler/csharp/csharp_map_field.cc +++ b/src/google/protobuf/compiler/csharp/csharp_map_field.cc @@ -62,7 +62,6 @@ void MapFieldGenerator::GenerateMembers(io::Printer* printer) { descriptor_->message_type()->FindFieldByName("value"); variables_["key_type_name"] = type_name(key_descriptor); variables_["value_type_name"] = type_name(value_descriptor); - variables_["true_for_wrappers"] = IsWrapperType(value_descriptor) ? "true" : ""; scoped_ptr key_generator(CreateFieldGenerator(key_descriptor, 1)); scoped_ptr value_generator(CreateFieldGenerator(value_descriptor, 2)); @@ -76,7 +75,7 @@ void MapFieldGenerator::GenerateMembers(io::Printer* printer) { printer->Print( variables_, ", $tag$);\n" - "private readonly pbc::MapField<$key_type_name$, $value_type_name$> $name$_ = new pbc::MapField<$key_type_name$, $value_type_name$>($true_for_wrappers$);\n"); + "private readonly pbc::MapField<$key_type_name$, $value_type_name$> $name$_ = new pbc::MapField<$key_type_name$, $value_type_name$>();\n"); WritePropertyDocComment(printer, descriptor_); AddDeprecatedFlag(printer); printer->Print( -- cgit v1.2.3