See #7. Fix bug in Adapter that JSON serializing query would always r…

…esult in an error. This bug was causing FindQuery requests to fail, and load all of the records (act like a FindAll without a query).
Streamlyne · Jul 29, 2014 · 61a9423 · 61a9423
1 parent a400e66
commit 61a9423
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Common/SLAdapter.m b/Common/SLAdapter.m
@@ -185,16 +185,17 @@ - (PMKPromise *) performRequestWithMethod:(SLHTTPMethodType)theMethod
         // Payload
         NSString *payload;
         if (theParams != nil) {
-            NSError *error;
+            NSError *error = nil;
             NSData *jsonData = [NSJSONSerialization dataWithJSONObject:theParams
                                                                options:(NSJSONWritingOptions) 0
                                                                  error:&error];
-            if (!error && jsonData)
+            if (error == nil && jsonData)
             {
                 payload = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
             } else {
                 NSLog(@"JSON stringify error: %@", error);
                 payload = @"";
+                return rejecter(error);
             }
         } else {
             NSLog(@"theParams is empty.");

diff --git a/Streamlyne-iOS-SDKTests/Streamlyne_iOS_SDKTests.m b/Streamlyne-iOS-SDKTests/Streamlyne_iOS_SDKTests.m
@@ -392,7 +392,7 @@ - (void) testPushAssetWithRelationships
     SLAsset *a1 = (SLAsset *)[[SLStore sharedStore] push:[SLAsset class] withData:pushData];
     //    NSLog(@"a1: %@", a1);
     XCTAssertStringEqual(pushData[@"nid"], a1.nid, @"`nid`s should match.");
-    SLAttribute *attr = [SLAttribute initWithId:@"abc"];
+    SLAttribute *attr = [SLAttribute initWithId:@"abc" inContext:[SLStore sharedStore].context];
     NSLog(@"Attr: %@", attr);
     NSSet *attrs = a1.attributes;
     NSLog(@"Attrs: %@", attrs);