Merge branch 'master' of github.com:mutualmobile/MMRecord

mutualmobile · May 8, 2013 · c616d6b · c616d6b
2 parents a0dea23 + 8c89297
commit c616d6b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Source/MMRecord/MMRecord.m b/Source/MMRecord/MMRecord.m
@@ -550,6 +550,14 @@ + (void)performRequestWithRequestState:(MMRecordRequestState *)state {
  if (state.failureBlock != nil) {
  state.failureBlock(error);
  }
+
+ if ([state isBatched]) {
+ dispatch_group_leave(state.dispatchGroup);
+ }
+
+#if NEEDS_DISPATCH_RETAIN_RELEASE
+ dispatch_release(state.dispatchGroup);
+#endif
  }];
 
  [self restoreDefaultOptions];

diff --git a/Source/MMRecord/MMRecordRepresentation.m b/Source/MMRecord/MMRecordRepresentation.m
@@ -114,7 +114,7 @@ - (id)primaryKeyValueFromDictionary:(NSDictionary *)dictionary {
  id value = nil;
 
  for (NSString *key in [primaryKeyRepresentation keyPaths]) {
- value = [dictionary valueForKey:key];
+ value = [dictionary valueForKeyPath:key];
 
  if (value != nil) {
  return value;