minor cleanup

3 files changed, 56 insertions, 86 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionInfoCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionInfoCache.cs
index 5d90b97..f3c2900 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionInfoCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionInfoCache.cs
@@ -429,6 +429,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                     if(byuuid != null)
                         byuuid.Remove(r.RegionID);
                     removeFromInner(r);
+                    storage[handle] = null;
                 }
                 storage.Remove(handle);
             }
@@ -586,27 +587,32 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         {
             if(expires == null || expires.Count == 0)
                 return 0;
-
+            
+            int expiresCount = expires.Count;
             List<ulong> toexpire = new List<ulong>();
+
             foreach(KeyValuePair<ulong, DateTime> kvp in expires)
             {
                 if(kvp.Value < now)
                     toexpire.Add(kvp.Key);
             }
 
-            if(toexpire.Count == 0)
-                return expires.Count;
+            int toexpireCount = toexpire.Count;
+            if(toexpireCount == 0)
+                return expiresCount;
 
-            if(toexpire.Count == expires.Count)
+            if(toexpireCount == expiresCount)
             {
                 Clear();
                 return 0;
             }
 
-            foreach(ulong h in toexpire)
+            if(storage != null)
             {
-                if(storage != null)
+                ulong h;
+                for(int i = 0; i < toexpireCount; i++)
                 {
+                    h = toexpire[i];
                     if(storage.ContainsKey(h))
                     {
                         GridRegion r = storage[h];
@@ -619,12 +625,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                         storage[h] = null;
                         storage.Remove(h);
                     }
+                    if(expires != null)
+                       expires.Remove(h);
                 }
-                if(expires != null)
-                   expires.Remove(h);
+            }
+            else
+            {
+                Clear();
+                return 0;
             }
 
-            if(expires.Count == 0)
+            if(expiresCount == 0)
             {
                 byname = null;
                 byuuid = null;
@@ -633,7 +644,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                 return 0;
             }
 
-            return expires.Count;
+            return expiresCount;
         }
 
         public int Count()
@@ -972,7 +983,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
                     if (expiredscopes.Count > 0)
                     {
                         foreach (UUID sid in expiredscopes)
+                        {
+                            InfobyScope[sid] = null;
                             InfobyScope.Remove(sid);
+                        }
                     }
                 }
                 finally { Monitor.Exit(syncRoot); }
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index f3b8e1d..20f9770 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -79,12 +79,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
 
         private List<string> m_warnings = new List<string>();
 
-        // private object m_syncy = new object();
-
-//        private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider();
-//        private static VBCodeProvider VBcodeProvider = new VBCodeProvider();
-
-        // private static int instanceID = new Random().Next(0, int.MaxValue);                 // Unique number to use on our compiled files
         private static UInt64 scriptCompileCounter = 0;                                     // And a counter
 
         public IScriptEngine m_scriptEngine;
@@ -251,23 +245,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             }
         }
 
-        ////private ICodeCompiler icc = codeProvider.CreateCompiler();
-        //public string CompileFromFile(string LSOFileName)
-        //{
-        //    switch (Path.GetExtension(LSOFileName).ToLower())
-        //    {
-        //        case ".txt":
-        //        case ".lsl":
-        //            Common.ScriptEngineBase.Shared.SendToDebug("Source code is LSL, converting to CS");
-        //            return CompileFromLSLText(File.ReadAllText(LSOFileName));
-        //        case ".cs":
-        //            Common.ScriptEngineBase.Shared.SendToDebug("Source code is CS");
-        //            return CompileFromCSText(File.ReadAllText(LSOFileName));
-        //        default:
-        //            throw new Exception("Unknown script type.");
-        //    }
-        //}
-
         public string GetCompilerOutput(string assetID)
         {
             return Path.Combine(ScriptEnginesPath, Path.Combine(
@@ -578,8 +555,6 @@ namespace SecondLife
             switch (lang)
             {
                 case enumCompileType.vb:
-//                    results = VBcodeProvider.CompileAssemblyFromSource(
-//                            parameters, Script);
                     provider = CodeDomProvider.CreateProvider("VisualBasic");
                     break;
                 case enumCompileType.cs:
@@ -594,56 +569,36 @@ namespace SecondLife
             if(provider == null)
                     throw new Exception("Compiler failed to load ");
 
+            bool complete = false;
+            bool retried = false;
 
-                    bool complete = false;
-                    bool retried = false;
-
-                    do
+            do
+            {
+                results = provider.CompileAssemblyFromSource(
+                        parameters, Script);
+                // Deal with an occasional segv in the compiler.
+                // Rarely, if ever, occurs twice in succession.
+                // Line # == 0 and no file name are indications that
+                // this is a native stack trace rather than a normal
+                // error log.
+                if (results.Errors.Count > 0)
+                {
+                    if (!retried && string.IsNullOrEmpty(results.Errors[0].FileName) &&
+                        results.Errors[0].Line == 0)
                     {
-//                        lock (CScodeProvider)
-//                        {
-//                            results = CScodeProvider.CompileAssemblyFromSource(
-//                                parameters, Script);
-//                        }
-
-                        results = provider.CompileAssemblyFromSource(
-                                parameters, Script);
-                        // Deal with an occasional segv in the compiler.
-                        // Rarely, if ever, occurs twice in succession.
-                        // Line # == 0 and no file name are indications that
-                        // this is a native stack trace rather than a normal
-                        // error log.
-                        if (results.Errors.Count > 0)
-                        {
-                            if (!retried && string.IsNullOrEmpty(results.Errors[0].FileName) &&
-                                results.Errors[0].Line == 0)
-                            {
-                                // System.Console.WriteLine("retrying failed compilation");
-                                retried = true;
-                            }
-                            else
-                            {
-                                complete = true;
-                            }
-                        }
-                        else
-                        {
-                            complete = true;
-                        }
-                    } while (!complete);
-//                    break;
-//                default:
-//                    throw new Exception("Compiler is not able to recongnize " +
-//                                        "language type \"" + lang.ToString() + "\"");
-//            }
-
-//            foreach (Type type in results.CompiledAssembly.GetTypes())
-//            {
-//                foreach (MethodInfo method in type.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Static))
-//                {
-//                    m_log.DebugFormat("[COMPILER]: {0}.{1}", type.FullName, method.Name);
-//                }
-//            }
+                        // System.Console.WriteLine("retrying failed compilation");
+                        retried = true;
+                    }
+                    else
+                    {
+                        complete = true;
+                    }
+                }
+                else
+                {
+                    complete = true;
+                }
+            } while (!complete);
 
             //
             // WARNINGS AND ERRORS
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index c1abba2..870957b 100755
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -2149,10 +2149,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             string fn = Path.GetFileName(assemName);
 
             string assem = String.Empty;
+            string assemNameText = assemName + ".text";
 
-            if (File.Exists(assemName + ".text"))
+            if (File.Exists(assemNameText))
             {
-                FileInfo tfi = new FileInfo(assemName + ".text");
+                FileInfo tfi = new FileInfo(assemNameText);
 
                 if (tfi != null)
                 {
@@ -2160,7 +2161,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
                     try
                     {
-                        using (FileStream tfs = File.Open(assemName + ".text",
+                        using (FileStream tfs = File.Open(assemNameText,
                                 FileMode.Open, FileAccess.Read))
                         {
                             tfs.Read(tdata, 0, tdata.Length);