Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

1 files changed, 28 insertions, 18 deletions

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;
         }
     }