One more thing related to the previous commit. Must avoid all in-process remote calls.
parent
62ffc566c3
commit
a46538485b
|
@ -283,18 +283,23 @@ namespace OpenSim.Services.HypergridService
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
Object[] args = new Object[] { userURL };
|
if (userURL == m_ExternalName)
|
||||||
IUserAgentService userAgentService = new UserAgentServiceConnector(userURL); //ServerUtils.LoadPlugin<IUserAgentService>(m_AuthDll, args);
|
m_UserAgentService.VerifyAgent(aCircuit.SecureSessionID, aCircuit.ServiceSessionID);
|
||||||
if (userAgentService != null)
|
else
|
||||||
{
|
{
|
||||||
try
|
Object[] args = new Object[] { userURL };
|
||||||
|
IUserAgentService userAgentService = new UserAgentServiceConnector(userURL);
|
||||||
|
if (userAgentService != null)
|
||||||
{
|
{
|
||||||
return userAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);
|
try
|
||||||
}
|
{
|
||||||
catch
|
return userAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);
|
||||||
{
|
}
|
||||||
m_log.DebugFormat("[GATEKEEPER SERVICE]: Unable to contact authentication service at {0}", userURL);
|
catch
|
||||||
return false;
|
{
|
||||||
|
m_log.DebugFormat("[GATEKEEPER SERVICE]: Unable to contact authentication service at {0}", userURL);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue