Skip to content

Commit

Permalink
Fixed a mismatched endforeach, objects no longer set a relationship t…
Browse files Browse the repository at this point in the history
…o nil on dealloc unless the relationship is non-transient, fixed one-to-one relationship inverse setters not checking the setInverse flag
  • Loading branch information
tyrone-sudeium committed Aug 21, 2011
1 parent 0d62ffb commit 1185644
Showing 1 changed file with 4 additions and 4 deletions.
Expand Up @@ -184,10 +184,10 @@
{ {
<$if Relationship.inverseRelationship$><$if Relationship.inverseRelationship.isToMany$>if ((<$Relationship.name$>_ == nil || ![<$Relationship.name$>_ isEqual: <$Relationship.name$>]) && setInverse == YES) { <$if Relationship.inverseRelationship$><$if Relationship.inverseRelationship.isToMany$>if ((<$Relationship.name$>_ == nil || ![<$Relationship.name$>_ isEqual: <$Relationship.name$>]) && setInverse == YES) {
[<$Relationship.name$> remove<$Relationship.inverseRelationship.name.initialCapitalString$>Object: (<$managedObjectClassName$>*)self settingInverse: NO]; [<$Relationship.name$> remove<$Relationship.inverseRelationship.name.initialCapitalString$>Object: (<$managedObjectClassName$>*)self settingInverse: NO];
}<$else$>if (<$Relationship.name$>_ == nil) { }<$else$>if (<$Relationship.name$>_ == nil && setInverse == YES) {
[<$Relationship.name$> set<$Relationship.inverseRelationship.name.initialCapitalString$>: nil settingInverse: NO]; [<$Relationship.name$> set<$Relationship.inverseRelationship.name.initialCapitalString$>: nil settingInverse: NO];
} }
<$endif$><$if Relationship.isTransient$><$Relationship.name$> = <$Relationship.name$>_;<$else$>if (<$Relationship.name$> != <$Relationship.name$>_) { <$endif$><$endif$><$if Relationship.isTransient$><$Relationship.name$> = <$Relationship.name$>_;<$else$>if (<$Relationship.name$> != <$Relationship.name$>_) {
[<$Relationship.name$> release]; [<$Relationship.name$> release];
<$Relationship.name$> = [<$Relationship.name$>_ retain]; <$Relationship.name$> = [<$Relationship.name$>_ retain];
}<$endif$> }<$endif$>
Expand All @@ -214,8 +214,8 @@
{ {
<$foreach Attribute noninheritedAttributes do$><$if Attribute.hasDefinedAttributeType$>self.<$Attribute.name$> = nil; <$foreach Attribute noninheritedAttributes do$><$if Attribute.hasDefinedAttributeType$>self.<$Attribute.name$> = nil;
<$endif$><$endforeach do$> <$endif$><$endforeach do$>
<$foreach Relationship noninheritedRelationships do$>self.<$Relationship.name$> = nil; <$foreach Relationship noninheritedRelationships do$><$if ! Relationship.isTransient$>self.<$Relationship.name$> = nil;
<$endforeach do$> <$endif$><$endforeach do$>
[super dealloc]; [super dealloc];
} }


Expand Down

0 comments on commit 1185644

Please sign in to comment.