Adds usings for the http request, client and response

nul800sebastiaan · nul800sebastiaan · commit 36ffebbb49e6 · 2014-12-01T08:17:37.000+01:00
diff --git a/src/Umbraco.Web/Install/InstallHelper.cs b/src/Umbraco.Web/Install/InstallHelper.cs
@@ -41,7 +41,7 @@ internal InstallHelper(UmbracoContext umbContext)
         public IEnumerable<InstallSetupStep> GetAllSteps()
         {
             return new List<InstallSetupStep>
-            {                
+            {
                 new NewInstallStep(_umbContext.Application),
                 new UpgradeStep(),
                 new FilePermissionsStep(),
@@ -87,12 +87,12 @@ internal void DeleteLegacyInstaller()
                 {
                     Directory.Move(IOHelper.MapPath(SystemDirectories.Install), IOHelper.MapPath("~/app_data/temp/install_backup"));
                 }
-            }                
+            }
 
             if (Directory.Exists(IOHelper.MapPath("~/Areas/UmbracoInstall")))
-            {                
+            {
                 Directory.Delete(IOHelper.MapPath("~/Areas/UmbracoInstall"), true);
-            }   
+            }
         }
 
         internal void InstallStatus(bool isCompleted, string errorMsg)
@@ -193,14 +193,17 @@ internal IEnumerable<Package> GetStarterKits()
             {
                 var requestUri = string.Format("http://our.umbraco.org/webapi/StarterKit/Get/?umbracoVersion={0}",
                     UmbracoVersion.Current);
-                var request = new HttpRequestMessage(HttpMethod.Get, requestUri);
-                var httpClient = new HttpClient();
-                var response = httpClient.SendAsync(request).Result;
-                packages = response.Content.ReadAsAsync<IEnumerable<Package>>().Result.ToList();
+
+                using (var request = new HttpRequestMessage(HttpMethod.Get, requestUri))
+                using (var httpClient = new HttpClient())
+                using (var response = httpClient.SendAsync(request).Result)
+                {
+                    packages = response.Content.ReadAsAsync<IEnumerable<Package>>().Result.ToList();
+                }
             }
             catch (AggregateException ex)
             {
-               LogHelper.Error<InstallHelper>("Could not download list of available starter kits", ex);
+                LogHelper.Error<InstallHelper>("Could not download list of available starter kits", ex);
             }
 
             return packages;

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ internal InstallHelper(UmbracoContext umbContext)`
`41`	`41`	`public IEnumerable<InstallSetupStep> GetAllSteps()`
`42`	`42`	`{`
`43`	`43`	`return new List<InstallSetupStep>`
`44`		`- {`
	`44`	`+ {`
`45`	`45`	`new NewInstallStep(_umbContext.Application),`
`46`	`46`	`new UpgradeStep(),`
`47`	`47`	`new FilePermissionsStep(),`
`@@ -87,12 +87,12 @@ internal void DeleteLegacyInstaller()`
`87`	`87`	`{`
`88`	`88`	`Directory.Move(IOHelper.MapPath(SystemDirectories.Install), IOHelper.MapPath("~/app_data/temp/install_backup"));`
`89`	`89`	`}`
`90`		`- }`
	`90`	`+ }`
`91`	`91`
`92`	`92`	`if (Directory.Exists(IOHelper.MapPath("~/Areas/UmbracoInstall")))`
`93`		`- {`
	`93`	`+ {`
`94`	`94`	`Directory.Delete(IOHelper.MapPath("~/Areas/UmbracoInstall"), true);`
`95`		`- }`
	`95`	`+ }`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`internal void InstallStatus(bool isCompleted, string errorMsg)`
`@@ -193,14 +193,17 @@ internal IEnumerable<Package> GetStarterKits()`
`193`	`193`	`{`
`194`	`194`	`var requestUri = string.Format("http://our.umbraco.org/webapi/StarterKit/Get/?umbracoVersion={0}",`
`195`	`195`	`UmbracoVersion.Current);`
`196`		`- var request = new HttpRequestMessage(HttpMethod.Get, requestUri);`
`197`		`- var httpClient = new HttpClient();`
`198`		`- var response = httpClient.SendAsync(request).Result;`
`199`		`- packages = response.Content.ReadAsAsync<IEnumerable<Package>>().Result.ToList();`
	`196`	`+`
	`197`	`+ using (var request = new HttpRequestMessage(HttpMethod.Get, requestUri))`
	`198`	`+ using (var httpClient = new HttpClient())`
	`199`	`+ using (var response = httpClient.SendAsync(request).Result)`
	`200`	`+ {`
	`201`	`+ packages = response.Content.ReadAsAsync<IEnumerable<Package>>().Result.ToList();`
	`202`	`+ }`
`200`	`203`	`}`
`201`	`204`	`catch (AggregateException ex)`
`202`	`205`	`{`
`203`		`- LogHelper.Error<InstallHelper>("Could not download list of available starter kits", ex);`
	`206`	`+ LogHelper.Error<InstallHelper>("Could not download list of available starter kits", ex);`
`204`	`207`	`}`
`205`	`208`
`206`	`209`	`return packages;`