Merge branch 'master' into vehicles

1 files changed, 17 insertions, 8 deletions

diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 817e0d4..c0bb70c 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -323,13 +323,13 @@ namespace Flotsam.RegionModules.AssetCache
                 string filename = GetFileName(id);
                 if (File.Exists(filename))
                 {
+                    FileStream stream = null;
                     try
                     {
-                        FileStream stream = File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.Read);
+                        stream = File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.Read);
                         BinaryFormatter bformatter = new BinaryFormatter();
 
                         asset = (AssetBase)bformatter.Deserialize(stream);
-                        stream.Close();
 
                         UpdateMemoryCache(id, asset);
 
@@ -349,6 +349,11 @@ namespace Flotsam.RegionModules.AssetCache
                     {
                         LogException(e);
                     }
+                    finally
+                    {
+                        if (stream != null)
+                            stream.Close();
+                    }
                 }
 
 
@@ -493,19 +498,20 @@ namespace Flotsam.RegionModules.AssetCache
 
         private void WriteFileCache(string filename, AssetBase asset)
         {
+            Stream stream = null;
+            // Make sure the target cache directory exists
+            string directory = Path.GetDirectoryName(filename);
+            // Write file first to a temp name, so that it doesn't look 
+            // like it's already cached while it's still writing.
+            string tempname = Path.Combine(directory, Path.GetRandomFileName());
             try
             {
-                // Make sure the target cache directory exists
-                string directory = Path.GetDirectoryName(filename);
                 if (!Directory.Exists(directory))
                 {
                     Directory.CreateDirectory(directory);
                 }
 
-                // Write file first to a temp name, so that it doesn't look 
-                // like it's already cached while it's still writing.
-                string tempname = Path.Combine(directory, Path.GetRandomFileName());
-                Stream stream = File.Open(tempname, FileMode.Create);
+                stream = File.Open(tempname, FileMode.Create);
                 BinaryFormatter bformatter = new BinaryFormatter();
                 bformatter.Serialize(stream, asset);
                 stream.Close();
@@ -522,6 +528,9 @@ namespace Flotsam.RegionModules.AssetCache
             }
             finally
             {
+                if (stream != null)
+                    stream.Close();
+
                 // Even if the write fails with an exception, we need to make sure
                 // that we release the lock on that file, otherwise it'll never get
                 // cached