Bug in 0.6.9 sometimes restoring script state causes region console to crash due to unhandled file lock exception. Attempt to resolve by wrapping several instances of file create / read logic in using statements and added some error handling for locked file exceptions. If it is IDisposable, it must be disposed! The close statements are unnecessary but harmless so I have left those in. The end of the using block will close and dispose automagically.

1 files changed, 84 insertions, 39 deletions

diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index bc5df11..0299385 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1343,10 +1343,12 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
                     try
                     {
-                        FileStream tfs = File.Open(assemName + ".text",
-                                FileMode.Open, FileAccess.Read);
-                        tfs.Read(tdata, 0, tdata.Length);
-                        tfs.Close();
+                        using (FileStream tfs = File.Open(assemName + ".text",
+                                FileMode.Open, FileAccess.Read))
+                        {
+                            tfs.Read(tdata, 0, tdata.Length);
+                            tfs.Close();
+                        }
 
                         assem = new System.Text.ASCIIEncoding().GetString(tdata);
                     }
@@ -1366,9 +1368,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
                     try
                     {
-                        FileStream fs = File.Open(assemName, FileMode.Open, FileAccess.Read);
-                        fs.Read(data, 0, data.Length);
-                        fs.Close();
+                        using (FileStream fs = File.Open(assemName, FileMode.Open, FileAccess.Read))
+                        {
+                            fs.Read(data, 0, data.Length);
+                            fs.Close();
+                        }
 
                         assem = System.Convert.ToBase64String(data);
                     }
@@ -1384,13 +1388,15 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
             if (File.Exists(fn + ".map"))
             {
-                FileStream mfs = File.Open(fn + ".map", FileMode.Open, FileAccess.Read);
-                StreamReader msr = new StreamReader(mfs);
-
-                map = msr.ReadToEnd();
-
-                msr.Close();
-                mfs.Close();
+                using (FileStream mfs = File.Open(fn + ".map", FileMode.Open, FileAccess.Read))
+                {
+                    using (StreamReader msr = new StreamReader(mfs))
+                    {
+                        map = msr.ReadToEnd();
+                        msr.Close();
+                    }
+                    mfs.Close();
+                }
             }
 
             XmlElement assemblyData = doc.CreateElement("", "Assembly", "");
@@ -1478,30 +1484,59 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 {
                     Byte[] filedata = Convert.FromBase64String(base64);
 
-                    FileStream fs = File.Create(path);
-                    fs.Write(filedata, 0, filedata.Length);
-                    fs.Close();
-
-                    fs = File.Create(path + ".text");
-                    StreamWriter sw = new StreamWriter(fs);
-
-                    sw.Write(base64);
-
-                    sw.Close();
-                    fs.Close();
+                    try
+                    {
+                        using (FileStream fs = File.Create(path))
+                        {
+                            fs.Write(filedata, 0, filedata.Length);
+                            fs.Close();
+                        }
+                    }
+                    catch (IOException ex)
+                    {
+                        // if there already exists a file at that location, it may be locked.
+                        m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", path, ex.Message);
+                    }
+                    try
+                    {
+                        using (FileStream fs = File.Create(path + ".text"))
+                        {
+                            using (StreamWriter sw = new StreamWriter(fs))
+                            {
+                                sw.Write(base64);
+                                sw.Close();
+                            }
+                            fs.Close();
+                        }
+                    }
+                    catch (IOException ex)
+                    {
+                        // if there already exists a file at that location, it may be locked.
+                        m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", path, ex.Message);
+                    }
                 }
             }
 
             string statepath = Path.Combine("ScriptEngines", World.RegionInfo.RegionID.ToString());
             statepath = Path.Combine(statepath, itemID.ToString() + ".state");
 
-            FileStream sfs = File.Create(statepath);
-            StreamWriter ssw = new StreamWriter(sfs);
-
-            ssw.Write(stateE.OuterXml);
-
-            ssw.Close();
-            sfs.Close();
+            try
+            {
+                using (FileStream sfs = File.Create(statepath))
+                {
+                    using (StreamWriter ssw = new StreamWriter(sfs))
+                    {
+                        ssw.Write(stateE.OuterXml);
+                        ssw.Close();
+                    }
+                    sfs.Close();
+                }
+            }
+            catch (IOException ex)
+            {
+                // if there already exists a file at that location, it may be locked.
+                m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", statepath, ex.Message);
+            }
 
             XmlNodeList mapL = rootE.GetElementsByTagName("LineMap");
             if (mapL.Count > 0)
@@ -1511,13 +1546,23 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 string mappath = Path.Combine("ScriptEngines", World.RegionInfo.RegionID.ToString());
                 mappath = Path.Combine(mappath, mapE.GetAttribute("Filename"));
 
-                FileStream mfs = File.Create(mappath);
-                StreamWriter msw = new StreamWriter(mfs);
-
-                msw.Write(mapE.InnerText);
-
-                msw.Close();
-                mfs.Close();
+                try
+                {
+                    using (FileStream mfs = File.Create(mappath))
+                    {
+                        using (StreamWriter msw = new StreamWriter(mfs))
+                        {
+                            msw.Write(mapE.InnerText);
+                            msw.Close();
+                        }
+                        mfs.Close();
+                    }
+                }
+                catch (IOException ex)
+                {
+                    // if there already exists a file at that location, it may be locked.
+                    m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", statepath, ex.Message);
+                }
             }
 
             return true;