kylefang/RestKit
1
0
Fork 0
mirror of https://github.com/zhigang1992/RestKit.git synced 2026-05-06 17:32:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'reachability-queue-three20' of git://github.com/twotoasters/RestKit into reachability-queue-three20

Browse Source 
Conflicts:
	Code/Network/RKRequest.m
	RestKit.xcodeproj/project.pbxproj
This commit is contained in:
Jeff Arena
2010-12-01 21:06:54 -08:00
parent 39f3d568e2 a53f28e339
commit 6249ece2bc
16 changed files with 381 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Code/ObjectMapping/RKObjectManager.m
View File

@@ -138,9 +138,7 @@ static RKObjectManager* sharedManager = nil;
}
- (RKObjectLoader*)objectLoaderWithResourcePath:(NSString*)resourcePath delegate:(NSObject<RKObjectLoaderDelegate>*)delegate {
// Grab request through client to get HTTP AUTH & Headers
RKRequest* request = [self.client requestWithResourcePath:resourcePath delegate:nil callback:nil];
RKObjectLoader* loader = [RKObjectLoader loaderWithMapper:self.mapper request:request delegate:delegate];
RKObjectLoader* loader = [RKObjectLoader loaderWithResourcePath:resourcePath mapper:self.mapper delegate:delegate];
loader.managedObjectStore = self.objectStore;
return loader;
@@ -205,7 +203,7 @@ static RKObjectManager* sharedManager = nil;
loader.method = method;
loader.params = params;
loader.source = object;
loader.targetObject = object;
loader.objectClass = [object class];
loader.managedObjectStore = self.objectStore;