Merge pull request flutter#1693 from jimbeveridge/close

Close the UrlLoaderProxy on error.
dattto · Oct 20, 2015 · 9826b5b · 9826b5b
2 parents bbfc3e8 + 924b9a7
commit 9826b5b
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/sky/packages/sky/lib/src/services/fetch.dart b/sky/packages/sky/lib/src/services/fetch.dart
@@ -36,24 +36,25 @@ class Response {
 }
 
 Future<UrlResponse> fetch(UrlRequest request) async {
+  UrlLoaderProxy loader = new UrlLoaderProxy.unbound();
   try {
-    UrlLoaderProxy loader = new UrlLoaderProxy.unbound();
     _networkService.ptr.createUrlLoader(loader);
     UrlResponse response = (await loader.ptr.start(request)).response;
-    loader.close();
     return response;
   } catch (e) {
     print("NetworkService unavailable $e");
     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();
   UrlRequest request = new UrlRequest()
     ..url = url
     ..autoFollowRedirects = true;
-  return await fetch(request);
+  return fetch(request);
 }
 
 Future<Response> fetchBody(String relativeUrl) async {