OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Dont' bother with a userAgentService != null check right after we've constructed it

0.7.2-post-fixes
Justin Clark-Casey (justincc) 2011-11-15 20:37:49 +00:00
parent 57cffcd1ec
commit 6b0553ed7c
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Services/HypergridService/GatekeeperService.cs
View File

@ -335,22 +335,21 @@ namespace OpenSim.Services.HypergridService
} }
if (userURL == m_ExternalName) if (userURL == m_ExternalName)
{
return m_UserAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID); return m_UserAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);
}
else else
{ {
// Object[] args = new Object[] { userURL };
IUserAgentService userAgentService = new UserAgentServiceConnector(userURL); IUserAgentService userAgentService = new UserAgentServiceConnector(userURL);
if (userAgentService != null)
try
{ {
try return userAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);
{ }
return userAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID); catch
} {
catch m_log.DebugFormat("[GATEKEEPER SERVICE]: Unable to contact authentication service at {0}", userURL);
{ return false;
m_log.DebugFormat("[GATEKEEPER SERVICE]: Unable to contact authentication service at {0}", userURL);
return false;
}
} }
} }