We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 0d89d87 commit c0c9ff1Copy full SHA for c0c9ff1
protobuf/runtime/src/com/google/protobuf/Descriptors.m
@@ -358,7 +358,6 @@ - (instancetype)initWithData:(CGPFieldData *)data
358
data_ = data;
359
tag_ = TagFromData(data);
360
javaType_ = [GetTypeObj(data->type)->javaType_ ordinal];
361
- fieldOptions_ = InitFieldOptions(data->optionsData);
362
containingType_ = containingType;
363
CGPFieldFixDefaultValue(self);
364
}
@@ -425,6 +424,9 @@ - (id)getDefaultValue {
425
424
- (ComGoogleProtobufDescriptorProtos_FieldOptions *)getOptions {
426
if (fieldOptions_ != nil) {
427
return fieldOptions_;
+ } else if (data_->optionsData != NULL) {
428
+ fieldOptions_ = InitFieldOptions(data_->optionsData);
429
+ return fieldOptions_;
430
} else {
431
return [ComGoogleProtobufDescriptorProtos_FieldOptions getDefaultInstance];
432
0 commit comments