From e41e52e09727842d990a31e2a5f7f3e9c88fe8b3 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Sun, 1 Jun 2014 17:39:11 +0300
Subject: Close streams immediately when we finish using them

---
 OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 57 +++++++++++++------------
 1 file changed, 29 insertions(+), 28 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/UuidGatherer.cs')

diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index a7015e1..d07cc6a 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -458,35 +458,36 @@ namespace OpenSim.Region.Framework.Scenes
             if (null == assetBase)
                 return;
 
-            MemoryStream ms = new MemoryStream(assetBase.Data);
-            StreamReader sr = new StreamReader(ms);
-
-            sr.ReadLine(); // Unknown (Version?)
-            sr.ReadLine(); // Unknown
-            sr.ReadLine(); // Unknown
-            sr.ReadLine(); // Name
-            sr.ReadLine(); // Comment ?
-            int count = Convert.ToInt32(sr.ReadLine()); // Item count
-
-            for (int i = 0 ; i < count ; i++)
+            using (MemoryStream ms = new MemoryStream(assetBase.Data))
+            using (StreamReader sr = new StreamReader(ms))
             {
-                string type = sr.ReadLine();
-                if (type == null)
-                    break;
-                string name = sr.ReadLine();
-                if (name == null)
-                    break;
-                string id = sr.ReadLine();
-                if (id == null)
-                    break;
-                string unknown = sr.ReadLine();
-                if (unknown == null)
-                    break;
-
-                // If it can be parsed as a UUID, it is an asset ID
-                UUID uuid;
-                if (UUID.TryParse(id, out uuid))
-                    assetUuids[uuid] = (sbyte)AssetType.Animation;
+                sr.ReadLine(); // Unknown (Version?)
+                sr.ReadLine(); // Unknown
+                sr.ReadLine(); // Unknown
+                sr.ReadLine(); // Name
+                sr.ReadLine(); // Comment ?
+                int count = Convert.ToInt32(sr.ReadLine()); // Item count
+
+                for (int i = 0 ; i < count ; i++)
+                {
+                    string type = sr.ReadLine();
+                    if (type == null)
+                        break;
+                    string name = sr.ReadLine();
+                    if (name == null)
+                        break;
+                    string id = sr.ReadLine();
+                    if (id == null)
+                        break;
+                    string unknown = sr.ReadLine();
+                    if (unknown == null)
+                        break;
+
+                    // If it can be parsed as a UUID, it is an asset ID
+                    UUID uuid;
+                    if (UUID.TryParse(id, out uuid))
+                        assetUuids[uuid] = (sbyte)AssetType.Animation;    // the asset is either an Animation or a Sound, but this distinction isn't important
+                }
             }
         }
 
-- 
cgit v1.1