Skip to content

Commit ffea7fa

Browse files
++
1 parent 8310abf commit ffea7fa

1 file changed

Lines changed: 18 additions & 14 deletions

File tree

‎pkgs/cronet_http/lib/src/cronet_client.dart‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,7 @@ jb.UrlRequestCallbackProxy$UrlRequestCallbackInterface _urlRequestCallbacks(
268268
'Invalid content-length header [$contentLengthHeader].',
269269
request.url,
270270
));
271-
urlRequest
272-
?..cancel()
273-
..release();
271+
urlRequest!.cancel();
274272
return;
275273
case final contentLengthHeader?:
276274
contentLength = int.parse(contentLengthHeader);
@@ -311,8 +309,8 @@ jb.UrlRequestCallbackProxy$UrlRequestCallbackInterface _urlRequestCallbacks(
311309
responseInfo?.releasedBy(arena);
312310
newLocationUrl?.releasedBy(arena);
313311
if (responseStreamCancelled) return;
314-
final responseHeaders =
315-
_cronetToClientHeaders(responseInfo!.getAllHeaders()!);
312+
final responseHeaders = _cronetToClientHeaders(
313+
responseInfo!.getAllHeaders()!..releasedBy(arena));
316314

317315
if (!request.followRedirects) {
318316
urlRequest!.cancel();
@@ -328,7 +326,7 @@ jb.UrlRequestCallbackProxy$UrlRequestCallbackInterface _urlRequestCallbacks(
328326
.toDartString(releaseOriginal: true),
329327
request: request,
330328
isRedirect: true,
331-
headers: _cronetToClientHeaders(responseInfo.getAllHeaders()!)));
329+
headers: responseHeaders));
332330

333331
profile?.responseData
334332
?..headersCommaValues = responseHeaders
@@ -545,11 +543,12 @@ class CronetClient extends BaseClient {
545543
final builder = engine._engine.newUrlRequestBuilder(
546544
jUrl,
547545
jb.UrlRequestCallbackProxy(
548-
_urlRequestCallbacks(request, responseCompleter, profile)),
546+
_urlRequestCallbacks(request, responseCompleter, profile)
547+
..releasedBy(arena)),
549548
_executor,
550549
)!
551-
..releasedBy(arena)
552-
..setHttpMethod(jMethod);
550+
..releasedBy(arena);
551+
builder.setHttpMethod(jMethod)?.release();
553552

554553
var headers = request.headers;
555554
if (body.isNotEmpty &&
@@ -577,16 +576,21 @@ class CronetClient extends BaseClient {
577576
rethrow;
578577
}
579578

580-
builder.setUploadDataProvider(
581-
jb.UploadDataProviders.create$2(data), _executor);
579+
builder
580+
.setUploadDataProvider(
581+
jb.UploadDataProviders.create$2(data)?..releasedBy(arena),
582+
_executor)
583+
?.release();
582584
}
583585

584-
final cronetRequest = builder.build()!..releasedBy(arena);
586+
final cronetRequest = builder.build()!;
585587
if (request case Abortable(:final abortTrigger?)) {
586-
unawaited(abortTrigger.whenComplete(cronetRequest.cancel));
588+
unawaited(abortTrigger.whenComplete(() {
589+
if (!cronetRequest.isReleased) cronetRequest.cancel();
590+
}));
587591
}
588592
cronetRequest.start();
589-
return responseCompleter.future;
593+
return responseCompleter.future.whenComplete(cronetRequest.release);
590594
});
591595
}
592596
}

0 commit comments

Comments
 (0)