kylefang/RestKit
1
0
Fork 0
mirror of https://github.com/zhigang1992/RestKit.git synced 2026-01-12 22:51:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Undo previous paginator change. Instead, pass a reference to the operation queue from the RKObjectManager to any Paginator objects constructed through the manager. refs #1076

Browse Source
This commit is contained in:
Blake Watters
2012-12-21 16:00:43 -05:00
parent 0f02687224
commit 929cd44bd7
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Code/Network/RKObjectManager.m
View File

@@ -526,6 +526,7 @@ static NSString *RKMIMETypeFromAFHTTPClientParameterEncoding(AFHTTPClientParamet
paginator.managedObjectContext = self.managedObjectStore.mainQueueManagedObjectContext;
paginator.managedObjectCache = self.managedObjectStore.managedObjectCache;
paginator.fetchRequestBlocks = self.fetchRequestBlocks;
paginator.operationQueue = self.operationQueue;
return paginator;
}

7
Code/Network/RKPaginator.m
View File

@@ -71,7 +71,6 @@ static NSUInteger RKPaginatorDefaultPerPage = 25;
self.objectCount = NSNotFound;
self.perPage = RKPaginatorDefaultPerPage;
self.loaded = NO;
self.operationQueue = [NSOperationQueue new];
}
return self;
@@ -209,7 +208,11 @@ static NSUInteger RKPaginatorDefaultPerPage = 25;
}
}];
[self.operationQueue addOperation:self.objectRequestOperation];
if (self.operationQueue) {
[self.operationQueue addOperation:self.objectRequestOperation];
} else {
[self.objectRequestOperation start];
}
}
- (void)waitUntilFinished