Merge branch 'equivalence-fix' of https://github.com/alexleigh/RestKit …

…into alexleigh-equivalence-fix Conflicts: Code/ObjectMapping/RKPropertyMapping.m Vendor/SOCKit
AvoGlobal · Jul 20, 2014 · 64c649e · 64c649e
2 parents c17a180 + 3441f65
commit 64c649e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Code/Network/RKRequestDescriptor.m b/Code/Network/RKRequestDescriptor.m
@@ -112,7 +112,7 @@ - (BOOL)isEqualToRequestDescriptor:(RKRequestDescriptor *)otherDescriptor
     [self.mapping isEqualToMapping:otherDescriptor.mapping] &&
     self.objectClass == otherDescriptor.objectClass &&
     self.method == otherDescriptor.method &&
-    [self.rootKeyPath isEqualToString:otherDescriptor.rootKeyPath];
+    ((self.rootKeyPath == otherDescriptor.rootKeyPath) || [self.rootKeyPath isEqualToString:otherDescriptor.rootKeyPath]);
 }
 
 @end
diff --git a/Code/Network/RKResponseDescriptor.m b/Code/Network/RKResponseDescriptor.m
@@ -177,8 +177,8 @@ - (BOOL)isEqualToResponseDescriptor:(RKResponseDescriptor *)otherDescriptor
     return
     [self.mapping isEqualToMapping:otherDescriptor.mapping] &&
     self.method == otherDescriptor.method &&
-    [self.pathPattern isEqualToString:otherDescriptor.pathPattern] &&
-    [self.keyPath isEqualToString:otherDescriptor.keyPath] &&
+    ((self.pathPattern == otherDescriptor.pathPattern) || [self.pathPattern isEqualToString:otherDescriptor.pathPattern]) &&
+    ((self.keyPath == otherDescriptor.keyPath) || [self.keyPath isEqualToString:otherDescriptor.keyPath]) &&
     [self.statusCodes isEqualToIndexSet:otherDescriptor.statusCodes];
 }