summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/google/protobuf/compiler/javanano/javanano_enum_field.cc5
-rw-r--r--src/google/protobuf/compiler/javanano/javanano_primitive_field.cc7
-rw-r--r--src/google/protobuf/unittest_has_nano.proto2
3 files changed, 9 insertions, 5 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_enum_field.cc b/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
index 5d3511b..eb73232 100644
--- a/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
+++ b/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
@@ -121,7 +121,8 @@ GenerateMergingCode(io::Printer* printer) const {
void EnumFieldGenerator::
GenerateSerializationCode(io::Printer* printer) const {
- if (descriptor_->is_required()) {
+ if (descriptor_->is_required() && !params_.generate_has()) {
+ // Always serialize a required field if we don't have the 'has' signal.
printer->Print(variables_,
"output.writeInt32($number$, this.$name$);\n");
} else {
@@ -140,7 +141,7 @@ GenerateSerializationCode(io::Printer* printer) const {
void EnumFieldGenerator::
GenerateSerializedSizeCode(io::Printer* printer) const {
- if (descriptor_->is_required()) {
+ if (descriptor_->is_required() && !params_.generate_has()) {
printer->Print(variables_,
"size += com.google.protobuf.nano.CodedOutputByteBufferNano\n"
" .computeInt32Size($number$, this.$name$);\n");
diff --git a/src/google/protobuf/compiler/javanano/javanano_primitive_field.cc b/src/google/protobuf/compiler/javanano/javanano_primitive_field.cc
index 3428f69..b6c98b4 100644
--- a/src/google/protobuf/compiler/javanano/javanano_primitive_field.cc
+++ b/src/google/protobuf/compiler/javanano/javanano_primitive_field.cc
@@ -342,7 +342,7 @@ GenerateMembers(io::Printer* printer, bool lazy_init) const {
if (params_.generate_has()) {
printer->Print(variables_,
- "public boolean has$capitalized_name$ = false;\n");
+ "public boolean has$capitalized_name$;\n");
}
}
@@ -401,7 +401,8 @@ GenerateSerializationConditional(io::Printer* printer) const {
void PrimitiveFieldGenerator::
GenerateSerializationCode(io::Printer* printer) const {
- if (descriptor_->is_required()) {
+ if (descriptor_->is_required() && !params_.generate_has()) {
+ // Always serialize a required field if we don't have the 'has' signal.
printer->Print(variables_,
"output.write$capitalized_type$($number$, this.$name$);\n");
} else {
@@ -414,7 +415,7 @@ GenerateSerializationCode(io::Printer* printer) const {
void PrimitiveFieldGenerator::
GenerateSerializedSizeCode(io::Printer* printer) const {
- if (descriptor_->is_required()) {
+ if (descriptor_->is_required() && !params_.generate_has()) {
printer->Print(variables_,
"size += com.google.protobuf.nano.CodedOutputByteBufferNano\n"
" .compute$capitalized_type$Size($number$, this.$name$);\n");
diff --git a/src/google/protobuf/unittest_has_nano.proto b/src/google/protobuf/unittest_has_nano.proto
index 3a1e5b5..61800f2 100644
--- a/src/google/protobuf/unittest_has_nano.proto
+++ b/src/google/protobuf/unittest_has_nano.proto
@@ -75,4 +75,6 @@ message TestAllTypesNanoHas {
optional NestedEnum default_nested_enum = 81 [default = BAR];
required int32 id = 86;
+ required NestedEnum required_enum = 87;
+
}