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.

---
 .../Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | 21 ++++++----
 .../Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs    | 12 +++---
 .../XmlRpcGroupsServicesConnectorModule.cs         | 46 +++++++++++++---------
 3 files changed, 47 insertions(+), 32 deletions(-)

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

diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index 37ab35a..ef1b92e 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -551,13 +551,20 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
                 reqStream.Close();
             }
 
-            HttpWebResponse fwdrsp = (HttpWebResponse)forwardreq.GetResponse();
-            Encoding encoding = Util.UTF8;
-            StreamReader fwdresponsestream = new StreamReader(fwdrsp.GetResponseStream(), encoding);
-            fwdresponsestr = fwdresponsestream.ReadToEnd();
-            fwdresponsecontenttype = fwdrsp.ContentType;
-            fwdresponsecode = (int)fwdrsp.StatusCode;
-            fwdresponsestream.Close();
+            using (HttpWebResponse fwdrsp = (HttpWebResponse)forwardreq.GetResponse())
+            {
+                Encoding encoding = Util.UTF8;
+
+                using (Stream s = fwdrsp.GetResponseStream())
+                {
+                    using (StreamReader fwdresponsestream = new StreamReader(s))
+                    {
+                        fwdresponsestr = fwdresponsestream.ReadToEnd();
+                        fwdresponsecontenttype = fwdrsp.ContentType;
+                        fwdresponsecode = (int)fwdrsp.StatusCode;
+                    }
+                }
+            }
 
             response["content_type"] = fwdresponsecontenttype;
             response["str_response_string"] = fwdresponsestr;
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)
             {
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
index 1101851..71b24ac 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
@@ -1146,28 +1146,38 @@ namespace Nwc.XmlRpc
             request.AllowWriteStreamBuffering = true;
             request.KeepAlive = !_disableKeepAlive;
 
-            Stream stream = request.GetRequestStream();
-            XmlTextWriter xml = new XmlTextWriter(stream, Encoding.ASCII);
-            _serializer.Serialize(xml, this);
-            xml.Flush();
-            xml.Close();
-
-            HttpWebResponse response = (HttpWebResponse)request.GetResponse();
-            StreamReader input = new StreamReader(response.GetResponseStream());
-
-            string inputXml = input.ReadToEnd();
-            XmlRpcResponse resp;
-            try
+            using (Stream stream = request.GetRequestStream())
             {
-                resp = (XmlRpcResponse)_deserializer.Deserialize(inputXml);
+                using (XmlTextWriter xml = new XmlTextWriter(stream, Encoding.ASCII))
+                {
+                    _serializer.Serialize(xml, this);
+                    xml.Flush();
+                }            
             }
-            catch (Exception e)
+
+            XmlRpcResponse resp;
+
+            using (HttpWebResponse response = (HttpWebResponse)request.GetResponse())
             {
-                RequestResponse = inputXml;
-                throw e;
+                using (Stream s = response.GetResponseStream())
+                {
+                    using (StreamReader input = new StreamReader(s))
+                    {
+                        string inputXml = input.ReadToEnd();
+
+                        try
+                        {
+                            resp = (XmlRpcResponse)_deserializer.Deserialize(inputXml);
+                        }
+                        catch (Exception e)
+                        {
+                            RequestResponse = inputXml;
+                            throw e;
+                        }
+                    }
+                }
             }
-            input.Close();
-            response.Close();
+
             return resp;
         }
     }
-- 
cgit v1.1