Fixed bug that occurs sometimes on script unload where queued script event was attempted executed after AppDomain was unloaded.

2 files changed, 57 insertions, 41 deletions

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
index 99971a5..9037c2a 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
@@ -131,57 +131,64 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
                 QueueItemStruct BlankQIS = new QueueItemStruct();

                 while (true)

                 {

-                    QueueItemStruct QIS = BlankQIS;

-                    bool GotItem = false;

-

-                    if (EventQueue.Count == 0)

-                    {

-                        // Nothing to do? Sleep a bit waiting for something to do

-                        Thread.Sleep(NothingToDoSleepms);

-                    }

-                    else

+                    try

                     {

-                        // Something in queue, process

-                        //myScriptEngine.m_logger.Verbose("ScriptEngine", "Processing event for localID: " + QIS.localID + ", itemID: " + QIS.itemID + ", FunctionName: " + QIS.FunctionName);

+                        QueueItemStruct QIS = BlankQIS;

+                        bool GotItem = false;

 

-                        // OBJECT BASED LOCK - TWO THREADS WORKING ON SAME OBJECT IS NOT GOOD

-                        lock (QueueLock)

+                        if (EventQueue.Count == 0)

                         {

-                            GotItem = false;

-                            for (int qc = 0; qc < EventQueue.Count; qc++)

+                            // Nothing to do? Sleep a bit waiting for something to do

+                            Thread.Sleep(NothingToDoSleepms);

+                        }

+                        else

+                        {

+                            // Something in queue, process

+                            //myScriptEngine.m_logger.Verbose("ScriptEngine", "Processing event for localID: " + QIS.localID + ", itemID: " + QIS.itemID + ", FunctionName: " + QIS.FunctionName);

+

+                            // OBJECT BASED LOCK - TWO THREADS WORKING ON SAME OBJECT IS NOT GOOD

+                            lock (QueueLock)

                             {

-                                // Get queue item

-                                QIS = EventQueue.Dequeue();

+                                GotItem = false;

+                                for (int qc = 0; qc < EventQueue.Count; qc++)

+                                {

+                                    // Get queue item

+                                    QIS = EventQueue.Dequeue();

+

+                                    // Check if object is being processed by someone else

+                                    if (TryLock(QIS.localID) == false)

+                                    {

+                                        // Object is already being processed, requeue it

+                                        EventQueue.Enqueue(QIS);

+                                    }

+                                    else

+                                    {

+                                        // We have lock on an object and can process it

+                                        GotItem = true;

+                                        break;

+                                    }

+                                } // go through queue

+                            } // lock

 

-                                // Check if object is being processed by someone else

-                                if (TryLock(QIS.localID) == false)

+                            if (GotItem == true)

+                            {

+                                // Execute function

+                                try

                                 {

-                                    // Object is already being processed, requeue it

-                                    EventQueue.Enqueue(QIS);

+                                    myScriptEngine.myScriptManager.ExecuteEvent(QIS.localID, QIS.itemID, QIS.FunctionName, QIS.param);

                                 }

-                                else

+                                finally

                                 {

-                                    // We have lock on an object and can process it

-                                    GotItem = true;

-                                    break;

+                                    ReleaseLock(QIS.localID);

                                 }

-                            } // go through queue

-                        } // lock

-

-                        if (GotItem == true)

-                        {

-                            // Execute function

-                            try

-                            {

-                                myScriptEngine.myScriptManager.ExecuteEvent(QIS.localID, QIS.itemID, QIS.FunctionName, QIS.param);

                             }

-                            finally

-                            {

-                                ReleaseLock(QIS.localID);

-                            }

-                        }

 

-                    } // Something in queue

+                        } // Something in queue

+                    } catch {ThreadAbortException tae) {

+                        throw tae;

+                    } catch (Exception e) {

+                        Console.WriteLine("Exception in EventQueueThreadLoop: " + e.ToString());

+                    }

                 } // while

             } // try

             catch (ThreadAbortException tae)

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index c7c33bb..5dc928a 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -362,9 +362,18 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
             // Execute a function in the script

             //m_scriptEngine.Log.Verbose("ScriptEngine", "Executing Function localID: " + localID + ", itemID: " + itemID + ", FunctionName: " + FunctionName);

             LSL_BaseClass Script = m_scriptEngine.myScriptManager.GetScript(localID, itemID);

+            if (Script == null)

+                return;

 

             // Must be done in correct AppDomain, so leaving it up to the script itself

-            Script.Exec.ExecuteEvent(FunctionName, args);

+            try

+            {

+                Script.Exec.ExecuteEvent(FunctionName, args);

+            }

+            catch (Exception e)

+            {

+                Console.WriteLine("Exception executing script funcion: " + e.ToString());

+            }

 

         }