Merge pull request protocolbuffers#2985 from thomasvl/class_check_tweaks

Tighten up class usage/checks.
goldenbull · Apr 18, 2017 · a3873ca · a3873ca
2 parents 8aa927f + f5a01d1
commit a3873ca
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/objectivec/GPBMessage.m b/objectivec/GPBMessage.m
@@ -130,7 +130,7 @@ static id GetOrCreateMapIvarWithField(GPBMessage *self,
 
 static void CheckExtension(GPBMessage *self,
                            GPBExtensionDescriptor *extension) {
-  if ([self class] != extension.containingMessageClass) {
+  if (![self isKindOfClass:extension.containingMessageClass]) {
     [NSException
          raise:NSInvalidArgumentException
         format:@"Extension %@ used on wrong class (%@ instead of %@)",
@@ -3189,7 +3189,7 @@ + (BOOL)resolveInstanceMethod:(SEL)sel {
 
 + (BOOL)resolveClassMethod:(SEL)sel {
   // Extensions scoped to a Message and looked up via class methods.
-  if (GPBResolveExtensionClassMethod(self, sel)) {
+  if (GPBResolveExtensionClassMethod([self descriptor].messageClass, sel)) {
     return YES;
   }
   return [super resolveClassMethod:sel];