Revert "Next OSG test. Don't remove app domains if they contain running threads."
This reverts commit f831a1778b
.
With this, post-fixes is back to normal.
0.6.9-post-fixes
parent
f831a1778b
commit
82d0d1c092
|
@ -277,7 +277,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
|
|||
// Clear the event queue and abort the instance thread
|
||||
//
|
||||
instance.ClearQueue();
|
||||
bool stopped = instance.Stop(0);
|
||||
instance.Stop(0);
|
||||
|
||||
// Release events, timer, etc
|
||||
//
|
||||
|
@ -287,8 +287,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
|
|||
// Must be done explicitly because they have infinite
|
||||
// lifetime
|
||||
//
|
||||
if (stopped)
|
||||
m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
|
||||
m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
|
||||
if (m_DomainScripts[instance.AppDomain].Count == 0)
|
||||
{
|
||||
m_DomainScripts.Remove(instance.AppDomain);
|
||||
|
@ -805,7 +804,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
|
|||
m_Scripts.Remove(itemID);
|
||||
|
||||
instance.ClearQueue();
|
||||
bool stopped = instance.Stop(0);
|
||||
instance.Stop(0);
|
||||
|
||||
// bool objectRemoved = false;
|
||||
|
||||
|
@ -830,8 +829,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
|
|||
instance.RemoveState();
|
||||
instance.DestroyScriptInstance();
|
||||
|
||||
if (stopped)
|
||||
m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
|
||||
m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
|
||||
if (m_DomainScripts[instance.AppDomain].Count == 0)
|
||||
{
|
||||
m_DomainScripts.Remove(instance.AppDomain);
|
||||
|
|
Loading…
Reference in New Issue