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.

---
 .../Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs              | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice')

diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index 881807a..cb69411 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -1116,18 +1116,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                 // Otherwise prepare the request
                 m_log.DebugFormat("[VivoxVoice] Sending request <{0}>", requrl);
 
-                HttpWebRequest  req = (HttpWebRequest)WebRequest.Create(requrl);
-                HttpWebResponse rsp = null;
+                HttpWebRequest req = (HttpWebRequest)WebRequest.Create(requrl);
 
                 // We are sending just parameters, no content
                 req.ContentLength = 0;
 
                 // Send request and retrieve the response
-                rsp = (HttpWebResponse)req.GetResponse();
-
-                XmlTextReader rdr = new XmlTextReader(rsp.GetResponseStream());
-                doc.Load(rdr);
-                rdr.Close();
+                using (HttpWebResponse rsp = (HttpWebResponse)req.GetResponse())
+                    using (Stream s = rsp.GetResponseStream())
+                        using (XmlTextReader rdr = new XmlTextReader(s))
+                            doc.Load(rdr);
             }
             catch (Exception e)
             {
-- 
cgit v1.1