diff options
Diffstat (limited to 'objectivec/GPBMessage.m')
| -rw-r--r-- | objectivec/GPBMessage.m | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/objectivec/GPBMessage.m b/objectivec/GPBMessage.m index 627a396e..37cff6ce 100644 --- a/objectivec/GPBMessage.m +++ b/objectivec/GPBMessage.m @@ -2372,17 +2372,11 @@ static void MergeRepeatedNotPackedFieldFromCodedInputStream( // zero signals EOF / limit reached return; } else { - if (GPBPreserveUnknownFields(syntax)) { - if (![self parseUnknownField:input - extensionRegistry:extensionRegistry - tag:tag]) { - // it's an endgroup tag - return; - } - } else { - if (![input skipField:tag]) { - return; - } + if (![self parseUnknownField:input + extensionRegistry:extensionRegistry + tag:tag]) { + // it's an endgroup tag + return; } } } // if(!merged) @@ -3083,7 +3077,7 @@ static void ResolveIvarSet(GPBFieldDescriptor *field, + (BOOL)resolveInstanceMethod:(SEL)sel { const GPBDescriptor *descriptor = [self descriptor]; if (!descriptor) { - return NO; + return [super resolveInstanceMethod:sel]; } // NOTE: hasOrCountSel_/setHasSel_ will be NULL if the field for the given |