aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorRobert Adams2013-07-10 08:55:54 -0700
committerRobert Adams2013-07-10 08:55:54 -0700
commit59d19f038a3fdac0c347844c7884e813f5c5c136 (patch)
tree12260e8ae5568d340ecf4b98ebed4307a396e9aa /OpenSim/Services
parentComment out old inbound UDP throttling hack. This would cause the UDP (diff)
downloadopensim-SC_OLD-59d19f038a3fdac0c347844c7884e813f5c5c136.zip
opensim-SC_OLD-59d19f038a3fdac0c347844c7884e813f5c5c136.tar.gz
opensim-SC_OLD-59d19f038a3fdac0c347844c7884e813f5c5c136.tar.bz2
opensim-SC_OLD-59d19f038a3fdac0c347844c7884e813f5c5c136.tar.xz
Remove a null reference exception in SimianPresenceServiceConnector that
occurs when GetGridUserInfo cannot find the requested user info.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs12
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
index 0a39088..01163aa 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
@@ -315,11 +315,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
315 315
316 UUID userID = new UUID(user); 316 UUID userID = new UUID(user);
317 OSDMap userResponse = GetUserData(userID); 317 OSDMap userResponse = GetUserData(userID);
318 if (userResponse != null)
319 return ResponseToGridUserInfo(userResponse);
320 318
321 m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve user data for {0}: {1}",userID,userResponse["Message"].AsString()); 319 if (userResponse == null)
322 return null; 320 {
321 m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve user data for {0}", userID);
322 }
323
324 // Note that ResponseToGridUserInfo properly checks for and returns a null if passed a null.
325 return ResponseToGridUserInfo(userResponse);
326
323 } 327 }
324 328
325 #endregion 329 #endregion