From 988ffe0a78ebda0410e61ce31a3bd689c774f59e Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Wed, 4 Jan 2017 15:03:42 -0500 Subject: Minor fix for autocreated object repeated fields and maps. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - If setting/clearing a repeated field/map that was objects, check the class before checking the autocreator. - Just to be paranoid, don’t mutate within copy/mutableCopy for the autocreated classes to ensure there is less chance of issues if someone does something really crazy threading wise. - Some more tests for the internal AutocreatedArray/AutocreatedDictionary classes to ensure things are working as expected. - Add Xcode 8.2 to the full_mac_build.sh supported list. --- objectivec/GPBArray.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'objectivec/GPBArray.m') diff --git a/objectivec/GPBArray.m b/objectivec/GPBArray.m index ae57747d..f401631d 100644 --- a/objectivec/GPBArray.m +++ b/objectivec/GPBArray.m @@ -2519,14 +2519,14 @@ static BOOL ArrayDefault_IsValidValue(int32_t value) { - (id)copyWithZone:(NSZone *)zone { if (_array == nil) { - _array = [[NSMutableArray alloc] init]; + return [[NSMutableArray allocWithZone:zone] init]; } return [_array copyWithZone:zone]; } - (id)mutableCopyWithZone:(NSZone *)zone { if (_array == nil) { - _array = [[NSMutableArray alloc] init]; + return [[NSMutableArray allocWithZone:zone] init]; } return [_array mutableCopyWithZone:zone]; } -- cgit v1.2.3