Merge branch 'release/0.20.0-pre2'

tabeso · Dec 2, 2012 · f62f6ac · f62f6ac
2 parents 17996ad + 971083e
commit f62f6ac
Show file tree

Hide file tree

Showing 24 changed files with 495 additions and 750 deletions.
diff --git a/Code/CoreData/RKEntityByAttributeCache.m b/Code/CoreData/RKEntityByAttributeCache.m
@@ -270,7 +270,7 @@ - (void)addObject:(NSManagedObject *)object
     __block NSEntityDescription *entity;
     __block NSDictionary *attributeValues;
     __block NSManagedObjectID *objectID;
-    [self.managedObjectContext performBlockAndWait:^{
+    [object.managedObjectContext performBlockAndWait:^{
         entity = object.entity;
         objectID = [object objectID];
         attributeValues = [object dictionaryWithValuesForKeys:self.attributes];

diff --git a/Code/CoreData/RKEntityIdentifier.h b/Code/CoreData/RKEntityIdentifier.h
diff --git a/Code/CoreData/RKEntityIdentifier.m b/Code/CoreData/RKEntityIdentifier.m