Index: src/OFArray.m ================================================================== --- src/OFArray.m +++ src/OFArray.m @@ -487,15 +487,12 @@ [pool2 releaseObjects]; } [element retain]; - @try { - [pool release]; - } @finally { - [element autorelease]; - } + [pool release]; + [element autorelease]; return element; } - (void)makeObjectsPerformSelector: (SEL)selector Index: src/OFCountedSet.m ================================================================== --- src/OFCountedSet.m +++ src/OFCountedSet.m @@ -205,15 +205,12 @@ [pool2 releaseObjects]; } [element retain]; - @try { - [pool release]; - } @finally { - [element autorelease]; - } + [pool release]; + [element autorelease]; return element; } #ifdef OF_HAVE_BLOCKS Index: src/OFDataArray.m ================================================================== --- src/OFDataArray.m +++ src/OFDataArray.m @@ -461,15 +461,12 @@ elementWithName: [self className] namespace: OF_SERIALIZATION_NS stringValue: of_base64_encode(data, count * itemSize)]; [element retain]; - @try { - [pool release]; - } @finally { - [element autorelease]; - } + [pool release]; + [element autorelease]; return element; } @end Index: src/OFDate.m ================================================================== --- src/OFDate.m +++ src/OFDate.m @@ -357,15 +357,12 @@ stringValue: secondsString]; [element addAttributeWithName: @"microseconds" stringValue: microsecondsString]; [element retain]; - @try { - [pool release]; - } @finally { - [element autorelease]; - } + [pool release]; + [element autorelease]; return element; } - (uint32_t)microsecond Index: src/OFDictionary.m ================================================================== --- src/OFDictionary.m +++ src/OFDictionary.m @@ -531,14 +531,11 @@ [pool2 releaseObjects]; } [element retain]; - @try { - [pool release]; - } @finally { - [element autorelease]; - } + [pool release]; + [element autorelease]; return element; } @end Index: src/OFList.m ================================================================== --- src/OFList.m +++ src/OFList.m @@ -375,15 +375,12 @@ [pool2 releaseObjects]; } [element retain]; - @try { - [pool release]; - } @finally { - [element autorelease]; - } + [pool release]; + [element autorelease]; return element; } - (int)countByEnumeratingWithState: (of_fast_enumeration_state_t*)state Index: src/OFNull.m ================================================================== --- src/OFNull.m +++ src/OFNull.m @@ -72,15 +72,12 @@ element = [OFXMLElement elementWithName: [self className] namespace: OF_SERIALIZATION_NS]; [element retain]; - @try { - [pool release]; - } @finally { - [element autorelease]; - } + [pool release]; + [element autorelease]; return element; } - autorelease Index: src/OFNumber.m ================================================================== --- src/OFNumber.m +++ src/OFNumber.m @@ -1247,14 +1247,11 @@ default: @throw [OFInvalidFormatException newWithClass: isa]; } [element retain]; - @try { - [pool release]; - } @finally { - [element autorelease]; - } + [pool release]; + [element autorelease]; return element; } @end Index: src/OFObject+Serialization.m ================================================================== --- src/OFObject+Serialization.m +++ src/OFObject+Serialization.m @@ -51,14 +51,11 @@ ret = [@"\n" stringByAppendingString: [root XMLStringWithIndentation: 2]]; [ret retain]; - @try { - [pool release]; - } @finally { - [ret autorelease]; - } + [pool release]; + [ret autorelease]; return ret; } @end Index: src/OFSet.m ================================================================== --- src/OFSet.m +++ src/OFSet.m @@ -354,15 +354,12 @@ [pool2 releaseObjects]; } [element retain]; - @try { - [pool release]; - } @finally { - [element autorelease]; - } + [pool release]; + [element autorelease]; return element; } #ifdef OF_HAVE_BLOCKS Index: src/OFString+Serialization.m ================================================================== --- src/OFString+Serialization.m +++ src/OFString+Serialization.m @@ -53,17 +53,14 @@ if ([elements count] != 1) @throw [OFInvalidArgumentException newWithClass: isa selector: _cmd]; - object = [[[elements firstObject] objectByDeserializing] retain]; - - @try { - [pool release]; - } @catch (id e) { - [object release]; - @throw e; - } - - return [object autorelease]; + object = [[elements firstObject] objectByDeserializing]; + + [object retain]; + [pool release]; + [object autorelease]; + + return object; } @end Index: src/OFString.m ================================================================== --- src/OFString.m +++ src/OFString.m @@ -1309,15 +1309,12 @@ element = [OFXMLElement elementWithName: className namespace: OF_SERIALIZATION_NS stringValue: self]; [element retain]; - @try { - [pool release]; - } @finally { - [element autorelease]; - } + [pool release]; + [element autorelease]; return element; } - (of_unichar_t)characterAtIndex: (size_t)index Index: src/OFURL.m ================================================================== --- src/OFURL.m +++ src/OFURL.m @@ -550,14 +550,11 @@ element = [OFXMLElement elementWithName: [self className] namespace: OF_SERIALIZATION_NS stringValue: [self string]]; [element retain]; - @try { - [pool release]; - } @finally { - [element autorelease]; - } + [pool release]; + [element autorelease]; return element; } @end Index: src/OFXMLAttribute.m ================================================================== --- src/OFXMLAttribute.m +++ src/OFXMLAttribute.m @@ -177,14 +177,11 @@ [element addAttributeWithName: @"stringValue" stringValue: stringValue]; [element retain]; - @try { - [pool release]; - } @finally { - [element autorelease]; - } + [pool release]; + [element autorelease]; return element; } @end Index: src/OFXMLElement+Serialization.m ================================================================== --- src/OFXMLElement+Serialization.m +++ src/OFXMLElement+Serialization.m @@ -46,14 +46,10 @@ newWithClass: class selector: @selector(initWithSerialization:)]; object = [[class alloc] initWithSerialization: self]; - @try { - [pool release]; - } @finally { - [object autorelease]; - } + [pool release]; - return object; + return [object autorelease]; } @end Index: src/OFXMLElement.m ================================================================== --- src/OFXMLElement.m +++ src/OFXMLElement.m @@ -844,15 +844,12 @@ [OFXMLElement elementWithName: @"comment" namespace: OF_SERIALIZATION_NS stringValue: comment]]; [element retain]; - @try { - [pool release]; - } @finally { - [element autorelease]; - } + [pool release]; + [element autorelease]; return element; } - (void)addAttribute: (OFXMLAttribute*)attribute