diff options
author | Justin Clark-Casey (justincc) | 2011-11-15 20:37:49 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-11-15 20:37:49 +0000 |
commit | 94b1c1639809f859b092f56927328b3c30dfdad6 (patch) | |
tree | 2da34fd9de165fdbd36ed340a80e5a47f51211fc /OpenSim/Services/HypergridService/GatekeeperService.cs | |
parent | Add comments about trying to avoid synchronous work off the EventManager.OnMa... (diff) | |
download | opensim-SC_OLD-94b1c1639809f859b092f56927328b3c30dfdad6.zip opensim-SC_OLD-94b1c1639809f859b092f56927328b3c30dfdad6.tar.gz opensim-SC_OLD-94b1c1639809f859b092f56927328b3c30dfdad6.tar.bz2 opensim-SC_OLD-94b1c1639809f859b092f56927328b3c30dfdad6.tar.xz |
Dont' bother with a userAgentService != null check right after we've constructed it
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/HypergridService/GatekeeperService.cs | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 9385b8d..e26383f 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
@@ -335,22 +335,21 @@ namespace OpenSim.Services.HypergridService | |||
335 | } | 335 | } |
336 | 336 | ||
337 | if (userURL == m_ExternalName) | 337 | if (userURL == m_ExternalName) |
338 | { | ||
338 | return m_UserAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID); | 339 | return m_UserAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID); |
340 | } | ||
339 | else | 341 | else |
340 | { | 342 | { |
341 | // Object[] args = new Object[] { userURL }; | ||
342 | IUserAgentService userAgentService = new UserAgentServiceConnector(userURL); | 343 | IUserAgentService userAgentService = new UserAgentServiceConnector(userURL); |
343 | if (userAgentService != null) | 344 | |
345 | try | ||
344 | { | 346 | { |
345 | try | 347 | return userAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID); |
346 | { | 348 | } |
347 | return userAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID); | 349 | catch |
348 | } | 350 | { |
349 | catch | 351 | m_log.DebugFormat("[GATEKEEPER SERVICE]: Unable to contact authentication service at {0}", userURL); |
350 | { | 352 | return false; |
351 | m_log.DebugFormat("[GATEKEEPER SERVICE]: Unable to contact authentication service at {0}", userURL); | ||
352 | return false; | ||
353 | } | ||
354 | } | 353 | } |
355 | } | 354 | } |
356 | 355 | ||