diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-07-30 11:49:27 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-07-30 11:49:27 -0700 |
| commit | bde01d532610543072de3fd9f5d40823e1f1d53f (patch) | |
| tree | 6e09e402e5422bc5959ec1032a9fb5b83f14d1e8 /src/google | |
| parent | 7909b2edeb19affdf3f96a0b13a8098f28860c3c (diff) | |
| parent | d18cc0845606c32e01e044ae5411c7053b1c73ec (diff) | |
Merge pull request #660 from jskeet/throw-on-null
Throw on null for string/bytes single fields
Diffstat (limited to 'src/google')
| -rw-r--r-- | src/google/protobuf/compiler/csharp/csharp_field_base.cc | 11 | ||||
| -rw-r--r-- | src/google/protobuf/compiler/csharp/csharp_primitive_field.cc | 4 |
2 files changed, 2 insertions, 13 deletions
diff --git a/src/google/protobuf/compiler/csharp/csharp_field_base.cc b/src/google/protobuf/compiler/csharp/csharp_field_base.cc index 2459d457..7e3bbeef 100644 --- a/src/google/protobuf/compiler/csharp/csharp_field_base.cc +++ b/src/google/protobuf/compiler/csharp/csharp_field_base.cc @@ -127,17 +127,6 @@ void FieldGeneratorBase::AddDeprecatedFlag(io::Printer* printer) { } } -void FieldGeneratorBase::AddNullCheck(io::Printer* printer) { - AddNullCheck(printer, "value"); -} - -void FieldGeneratorBase::AddNullCheck(io::Printer* printer, const std::string& name) { - if (is_nullable_type()) { - printer->Print(" pb::ThrowHelper.ThrowIfNull($name$, \"$name$\");\n", - "name", name); - } -} - void FieldGeneratorBase::AddPublicMemberAttributes(io::Printer* printer) { AddDeprecatedFlag(printer); } diff --git a/src/google/protobuf/compiler/csharp/csharp_primitive_field.cc b/src/google/protobuf/compiler/csharp/csharp_primitive_field.cc index 80f4a92d..fc043ec0 100644 --- a/src/google/protobuf/compiler/csharp/csharp_primitive_field.cc +++ b/src/google/protobuf/compiler/csharp/csharp_primitive_field.cc @@ -81,7 +81,7 @@ void PrimitiveFieldGenerator::GenerateMembers(io::Printer* printer) { } else { printer->Print( variables_, - " $name$_ = value ?? $default_value$;\n"); + " $name$_ = pb::Preconditions.CheckNotNull(value, \"value\");\n"); } printer->Print( " }\n" @@ -183,7 +183,7 @@ void PrimitiveOneofFieldGenerator::GenerateMembers(io::Printer* printer) { } else { printer->Print( variables_, - " $oneof_name$_ = value ?? $default_value$;\n"); + " $oneof_name$_ = pb::Preconditions.CheckNotNull(value, \"value\");\n"); } printer->Print( variables_, |