Browse Source

add using into a few more places

UbitUmarov 5 years ago
parent
commit
c7baee1638
2 changed files with 28 additions and 26 deletions
  1. 10 10
      OpenSim/Capabilities/LLSD.cs
  2. 18 16
      OpenSim/Capabilities/LLSDHelpers.cs

+ 10 - 10
OpenSim/Capabilities/LLSD.cs

@@ -107,17 +107,17 @@ namespace OpenSim.Framework.Capabilities
         /// <returns></returns>
         public static byte[] LLSDSerialize(object obj)
         {
-            StringWriter sw = new StringWriter();
-            XmlTextWriter writer = new XmlTextWriter(sw);
-            writer.Formatting = Formatting.None;
-
-            writer.WriteStartElement(String.Empty, "llsd", String.Empty);
-            LLSDWriteOne(writer, obj);
-            writer.WriteEndElement();
-
-            writer.Close();
+            using(StringWriter sw = new StringWriter())
+            using(XmlTextWriter writer = new XmlTextWriter(sw))
+            {
+                writer.Formatting = Formatting.None;
 
-            return Util.UTF8.GetBytes(sw.ToString());
+                writer.WriteStartElement(String.Empty, "llsd", String.Empty);
+                LLSDWriteOne(writer, obj);
+                writer.WriteEndElement();
+                writer.Flush();
+                return Util.UTF8.GetBytes(sw.ToString());
+            }           
         }
 
         /// <summary>

+ 18 - 16
OpenSim/Capabilities/LLSDHelpers.cs

@@ -41,30 +41,32 @@ namespace OpenSim.Framework.Capabilities
 
         public static string SerialiseLLSDReply(object obj)
         {
-            StringWriter sw = new StringWriter();
-            XmlTextWriter writer = new XmlTextWriter(sw);
-            writer.Formatting = Formatting.None;
-            writer.WriteStartElement(String.Empty, "llsd", String.Empty);
-            SerializeOSDType(writer, obj);
-            writer.WriteEndElement();
-            writer.Close();
-
+            using(StringWriter sw = new StringWriter())
+            using(XmlTextWriter writer = new XmlTextWriter(sw))
+            {
+                writer.Formatting = Formatting.None;
+                writer.WriteStartElement(String.Empty, "llsd", String.Empty);
+                SerializeOSDType(writer, obj);
+                writer.WriteEndElement();
+                writer.Flush();
             //m_log.DebugFormat("[LLSD Helpers]: Generated serialized LLSD reply {0}", sw.ToString());
 
-            return sw.ToString();
+                return sw.ToString();
+            }
         }
 
         public static string SerialiseLLSDReplyNoHeader(object obj)
         {
-            StringWriter sw = new StringWriter();
-            XmlTextWriter writer = new XmlTextWriter(sw);
-            writer.Formatting = Formatting.None;
-            SerializeOSDType(writer, obj);
-            writer.Close();
-
+            using(StringWriter sw = new StringWriter())
+            using(XmlTextWriter writer = new XmlTextWriter(sw))
+            {
+                writer.Formatting = Formatting.None;
+                SerializeOSDType(writer, obj);
+                writer.Flush();
             //m_log.DebugFormat("[LLSD Helpers]: Generated serialized LLSD reply {0}", sw.ToString());
 
-            return sw.ToString();
+                return sw.ToString();
+            }
         }
 
         private static void SerializeOSDType(XmlTextWriter writer, object obj)