diff options
author | Diva Canto | 2013-07-02 16:46:35 -0700 |
---|---|---|
committer | Diva Canto | 2013-07-02 16:46:35 -0700 |
commit | 4d24bf75fd695a12683987d9803018c2ec4cae60 (patch) | |
tree | e6bff84a06ba9aaa9ebb5099fba32027a1a9b486 | |
parent | Fix SQL statement (diff) | |
download | opensim-SC_OLD-4d24bf75fd695a12683987d9803018c2ec4cae60.zip opensim-SC_OLD-4d24bf75fd695a12683987d9803018c2ec4cae60.tar.gz opensim-SC_OLD-4d24bf75fd695a12683987d9803018c2ec4cae60.tar.bz2 opensim-SC_OLD-4d24bf75fd695a12683987d9803018c2ec4cae60.tar.xz |
Deleted debug messages. Fixed a null ref exception on the POST handler of GridUserServerPostHandler.cs
3 files changed, 7 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index ff31b67..90af82e 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | |||
@@ -323,7 +323,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
323 | GridUserInfo uInfo = m_Scenes[0].GridUserService.GetGridUserInfo(uuid.ToString()); | 323 | GridUserInfo uInfo = m_Scenes[0].GridUserService.GetGridUserInfo(uuid.ToString()); |
324 | if (uInfo != null) | 324 | if (uInfo != null) |
325 | { | 325 | { |
326 | m_log.DebugFormat("[USER MANAGEMENT MODULE]: Found grid user {0}", uInfo.UserID); | ||
327 | string url, first, last, tmp; | 326 | string url, first, last, tmp; |
328 | UUID u; | 327 | UUID u; |
329 | if (Util.ParseUniversalUserIdentifier(uInfo.UserID, out u, out url, out first, out last, out tmp)) | 328 | if (Util.ParseUniversalUserIdentifier(uInfo.UserID, out u, out url, out first, out last, out tmp)) |
@@ -336,10 +335,10 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
336 | return true; | 335 | return true; |
337 | } | 336 | } |
338 | else | 337 | else |
339 | m_log.DebugFormat("[USER MANAGEMENT MODULE]: Unable to parse UUI"); | 338 | m_log.DebugFormat("[USER MANAGEMENT MODULE]: Unable to parse UUI {0}", uInfo.UserID); |
340 | } | 339 | } |
341 | else | 340 | else |
342 | m_log.DebugFormat("[USER MANAGEMENT MODULE]: No grid user found"); | 341 | m_log.DebugFormat("[USER MANAGEMENT MODULE]: No grid user found {0}", uuid); |
343 | 342 | ||
344 | names[0] = "Unknown"; | 343 | names[0] = "Unknown"; |
345 | names[1] = "UserUMMTGUN6"; | 344 | names[1] = "UserUMMTGUN6"; |
diff --git a/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs b/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs index 687cf8d..7483395 100644 --- a/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs +++ b/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs | |||
@@ -185,10 +185,12 @@ namespace OpenSim.Server.Handlers.GridUser | |||
185 | GridUserInfo guinfo = m_GridUserService.GetGridUserInfo(user); | 185 | GridUserInfo guinfo = m_GridUserService.GetGridUserInfo(user); |
186 | 186 | ||
187 | Dictionary<string, object> result = new Dictionary<string, object>(); | 187 | Dictionary<string, object> result = new Dictionary<string, object>(); |
188 | result["result"] = guinfo.ToKeyValuePairs(); | 188 | if (guinfo != null) |
189 | result["result"] = guinfo.ToKeyValuePairs(); | ||
190 | else | ||
191 | result["result"] = "null"; | ||
189 | 192 | ||
190 | string xmlString = ServerUtils.BuildXmlResponse(result); | 193 | string xmlString = ServerUtils.BuildXmlResponse(result); |
191 | |||
192 | //m_log.DebugFormat("[GRID USER HANDLER]: resp string: {0}", xmlString); | 194 | //m_log.DebugFormat("[GRID USER HANDLER]: resp string: {0}", xmlString); |
193 | return Util.UTF8NoBomEncoding.GetBytes(xmlString); | 195 | return Util.UTF8NoBomEncoding.GetBytes(xmlString); |
194 | } | 196 | } |
diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs index af2701d..fa9a4a8 100644 --- a/OpenSim/Services/UserAccountService/GridUserService.cs +++ b/OpenSim/Services/UserAccountService/GridUserService.cs | |||
@@ -58,17 +58,14 @@ namespace OpenSim.Services.UserAccountService | |||
58 | { | 58 | { |
59 | GridUserData[] ds = m_Database.GetAll(userID); | 59 | GridUserData[] ds = m_Database.GetAll(userID); |
60 | if (ds == null) | 60 | if (ds == null) |
61 | { | ||
62 | m_log.DebugFormat("[GRID USER SERVICE]: user not found {0}", userID); | ||
63 | return null; | 61 | return null; |
64 | } | 62 | |
65 | if (ds.Length > 0) | 63 | if (ds.Length > 0) |
66 | { | 64 | { |
67 | d = ds[0]; | 65 | d = ds[0]; |
68 | foreach (GridUserData dd in ds) | 66 | foreach (GridUserData dd in ds) |
69 | if (dd.UserID.Length > d.UserID.Length) // find the longest | 67 | if (dd.UserID.Length > d.UserID.Length) // find the longest |
70 | d = dd; | 68 | d = dd; |
71 | m_log.DebugFormat("[GRID USER SERVICE]: Found user {0}", d.UserID); | ||
72 | } | 69 | } |
73 | } | 70 | } |
74 | 71 | ||