* One More thing, add an appdomain data element to ensure that we don't duplicate the assembly resolving.
parent
8fdf70b87e
commit
f83343d302
|
@ -58,8 +58,14 @@ namespace OpenSim.Data.PGSQL
|
||||||
{
|
{
|
||||||
if (!Util.IsPlatformMono)
|
if (!Util.IsPlatformMono)
|
||||||
{
|
{
|
||||||
AppDomain currentDomain = AppDomain.CurrentDomain;
|
|
||||||
currentDomain.AssemblyResolve += new ResolveEventHandler(ResolveEventHandlerMonoSec);
|
if (AppDomain.CurrentDomain.GetData("MonoSecurityPostgresAdded") == null)
|
||||||
|
{
|
||||||
|
AppDomain.CurrentDomain.SetData("MonoSecurityPostgresAdded", "true");
|
||||||
|
|
||||||
|
AppDomain currentDomain = AppDomain.CurrentDomain;
|
||||||
|
currentDomain.AssemblyResolve += new ResolveEventHandler(ResolveEventHandlerMonoSec);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -64,8 +64,13 @@ namespace OpenSim.Data.PGSQL
|
||||||
{
|
{
|
||||||
if (!Util.IsPlatformMono)
|
if (!Util.IsPlatformMono)
|
||||||
{
|
{
|
||||||
AppDomain currentDomain = AppDomain.CurrentDomain;
|
if (AppDomain.CurrentDomain.GetData("MonoSecurityPostgresAdded") == null)
|
||||||
currentDomain.AssemblyResolve += new ResolveEventHandler(ResolveEventHandlerMonoSec);
|
{
|
||||||
|
AppDomain.CurrentDomain.SetData("MonoSecurityPostgresAdded", "true");
|
||||||
|
|
||||||
|
AppDomain currentDomain = AppDomain.CurrentDomain;
|
||||||
|
currentDomain.AssemblyResolve += new ResolveEventHandler(ResolveEventHandlerMonoSec);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue