From 80c19b7cac52a57fd04966169c657400aeee3de8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 27 Feb 2013 00:21:02 +0000
Subject: Make sure we dispose of WebResponse, StreamReader and Stream in
 various places where we were not already.

---
 OpenSim/ConsoleClient/Requester.cs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'OpenSim/ConsoleClient')

diff --git a/OpenSim/ConsoleClient/Requester.cs b/OpenSim/ConsoleClient/Requester.cs
index aabb02c..0a21328 100644
--- a/OpenSim/ConsoleClient/Requester.cs
+++ b/OpenSim/ConsoleClient/Requester.cs
@@ -44,7 +44,6 @@ namespace OpenSim.ConsoleClient
                 ReplyDelegate action)
         {
             WebRequest request = WebRequest.Create(requestUrl);
-            WebResponse response = null;
 
             request.Method = "POST";
 
@@ -64,16 +63,18 @@ namespace OpenSim.ConsoleClient
                 {
                     string reply = String.Empty;
 
-                    response = request.EndGetResponse(ar);
-
-                    try
+                    using (WebResponse response = request.EndGetResponse(ar))
                     {
-                        StreamReader r = new StreamReader(response.GetResponseStream());
-                        reply = r.ReadToEnd();
+                        try
+                        {
+                            using (Stream s = response.GetResponseStream())
+                                using (StreamReader r = new StreamReader(s))
+                                    reply = r.ReadToEnd();
 
-                    }
-                    catch (System.InvalidOperationException)
-                    {
+                        }
+                        catch (System.InvalidOperationException)
+                        {
+                        }
                     }
 
                     action(requestUrl, data, reply);
-- 
cgit v1.1