diff --git a/React/Base/RCTMultipartDataTask.m b/React/Base/RCTMultipartDataTask.m index 0fb1623db..27feaffbb 100644 --- a/React/Base/RCTMultipartDataTask.m +++ b/React/Base/RCTMultipartDataTask.m @@ -55,6 +55,7 @@ static BOOL isStreamTaskSupported() { } NSURLSessionDataTask *dataTask = [session dataTaskWithRequest:request]; [dataTask resume]; + [session finishTasksAndInvalidate]; } - (void)URLSession:(__unused NSURLSession *)session @@ -91,7 +92,9 @@ didReceiveResponse:(NSURLResponse *)response - (void)URLSession:(__unused NSURLSession *)session task:(__unused NSURLSessionTask *)task didCompleteWithError:(NSError *)error { - _partHandler(_statusCode, _headers, _data, error, YES); + if (_partHandler) { + _partHandler(_statusCode, _headers, _data, error, YES); + } } - (void)URLSession:(__unused NSURLSession *)session dataTask:(__unused NSURLSessionDataTask *)dataTask didReceiveData:(NSData *)data @@ -111,6 +114,7 @@ didBecomeInputStream:(NSInputStream *)inputStream { RCTMultipartStreamReader *reader = [[RCTMultipartStreamReader alloc] initWithInputStream:inputStream boundary:_boundary]; RCTMultipartDataTaskCallback partHandler = _partHandler; + _partHandler = nil; NSInteger statusCode = _statusCode; BOOL completed = [reader readAllParts:^(NSDictionary *headers, NSData *content, BOOL done) {