Revision 258db46f pithos-macos/PithosContainerNode.m

b/pithos-macos/PithosContainerNode.m
227 227 
        } else {
228 228 
            newChildren = nil;
229 229 
            containerRequest = nil;
230 
            objects = nil;
231 230 
            forcedRefresh = NO;
232 231 
            @synchronized(self) {
233 232 
                freshness = PithosNodeStateRefreshNeeded;
......
246 245 
                pithosContainer.blockSize = [containerRequest blockSize];
247 246 
            }
248 247
248 
            NSMutableArray *objects = [containerRequest.userInfo objectForKey:@"objects"];
249 249 
            NSArray *someObjects = [containerRequest objects];
250 250 
            if (objects == nil) {
251 
                objects = [[NSMutableArray alloc] initWithArray:someObjects];
251 
                objects = [NSMutableArray arrayWithArray:someObjects];
252 252 
            } else {
253 253 
                [objects addObjectsFromArray:someObjects];
254 254 
            }
......
346 346 
                }
347 347 
                // Else cache was used and all results were fetched during this request, so existing children can be reused
348 348 
                containerRequest = nil;
349 
                objects = nil;
350 349 
                forcedRefresh = NO;
351 350 
                @synchronized(self) {
352 351 
                    freshness = PithosNodeStateRefreshFinished;
......
375 374 
                                             [NSNumber numberWithInteger:NSOperationQueuePriorityVeryHigh], @"priority",
376 375 
                                             [NSNumber numberWithUnsignedInteger:10], @"retries",
377 376 
                                             NSStringFromSelector(@selector(containerRequestFinished:)), @"didFinishSelector",
378 
                                             NSStringFromSelector(@selector(containerRequestFailed:)), @"didFailSelector",
377 
                                             NSStringFromSelector(@selector(containerRequestFailed:)), @"didFailSelector",
378 
                                             objects, @"objects",
379 379 
                                             nil];
380 380 
                [[PithosUtilities prepareRequest:containerRequest priority:NSOperationQueuePriorityVeryHigh] startAsynchronous];
381 381 
            }
382 382 
        } else if (containerRequest.responseStatusCode == 304) {
383 383 
            // Container is not modified, so existing children can be reused
384 384 
            containerRequest = nil;
385 
            objects = nil;
386 385 
            forcedRefresh = NO;
387 386 
            @synchronized(self) {
388 387 
                freshness = PithosNodeStateRefreshFinished;

Also available in: Unified diff