Commit a6c10185 authored by Jim Beveridge's avatar Jim Beveridge

Merge pull request #1693 from jimbeveridge/close

Close the UrlLoaderProxy on error.
parents 37b48007 2cb9a00f
...@@ -36,24 +36,25 @@ class Response { ...@@ -36,24 +36,25 @@ class Response {
} }
Future<UrlResponse> fetch(UrlRequest request) async { Future<UrlResponse> fetch(UrlRequest request) async {
try {
UrlLoaderProxy loader = new UrlLoaderProxy.unbound(); UrlLoaderProxy loader = new UrlLoaderProxy.unbound();
try {
_networkService.ptr.createUrlLoader(loader); _networkService.ptr.createUrlLoader(loader);
UrlResponse response = (await loader.ptr.start(request)).response; UrlResponse response = (await loader.ptr.start(request)).response;
loader.close();
return response; return response;
} catch (e) { } catch (e) {
print("NetworkService unavailable $e"); print("NetworkService unavailable $e");
return new UrlResponse()..statusCode = 500; return new UrlResponse()..statusCode = 500;
} finally {
loader.close();
} }
} }
Future<UrlResponse> fetchUrl(String relativeUrl) async { Future<UrlResponse> fetchUrl(String relativeUrl) {
String url = Uri.base.resolve(relativeUrl).toString(); String url = Uri.base.resolve(relativeUrl).toString();
UrlRequest request = new UrlRequest() UrlRequest request = new UrlRequest()
..url = url ..url = url
..autoFollowRedirects = true; ..autoFollowRedirects = true;
return await fetch(request); return fetch(request);
} }
Future<Response> fetchBody(String relativeUrl) async { Future<Response> fetchBody(String relativeUrl) async {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment