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

Deleted debug messages. Fixed a null ref exception on the POST handler of GridUserServerPostHandler.cs

cpu-performance
Diva Canto 2013-07-02 16:46:35 -07:00
parent 316e8f9239
commit 4d24bf75fd
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
View File

@ -323,7 +323,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
GridUserInfo uInfo = m_Scenes[0].GridUserService.GetGridUserInfo(uuid.ToString()); GridUserInfo uInfo = m_Scenes[0].GridUserService.GetGridUserInfo(uuid.ToString());
if (uInfo != null) if (uInfo != null)
{ {
m_log.DebugFormat("[USER MANAGEMENT MODULE]: Found grid user {0}", uInfo.UserID);
string url, first, last, tmp; string url, first, last, tmp;
UUID u; UUID u;
if (Util.ParseUniversalUserIdentifier(uInfo.UserID, out u, out url, out first, out last, out tmp)) 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
return true; return true;
} }
else else
m_log.DebugFormat("[USER MANAGEMENT MODULE]: Unable to parse UUI"); m_log.DebugFormat("[USER MANAGEMENT MODULE]: Unable to parse UUI {0}", uInfo.UserID);
} }
else else
m_log.DebugFormat("[USER MANAGEMENT MODULE]: No grid user found"); m_log.DebugFormat("[USER MANAGEMENT MODULE]: No grid user found {0}", uuid);
names[0] = "Unknown"; names[0] = "Unknown";
names[1] = "UserUMMTGUN6"; names[1] = "UserUMMTGUN6";

6
OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs
View File

@ -185,10 +185,12 @@ namespace OpenSim.Server.Handlers.GridUser
GridUserInfo guinfo = m_GridUserService.GetGridUserInfo(user); GridUserInfo guinfo = m_GridUserService.GetGridUserInfo(user);
Dictionary<string, object> result = new Dictionary<string, object>(); Dictionary<string, object> result = new Dictionary<string, object>();
result["result"] = guinfo.ToKeyValuePairs(); if (guinfo != null)
result["result"] = guinfo.ToKeyValuePairs();
else
result["result"] = "null";
string xmlString = ServerUtils.BuildXmlResponse(result); string xmlString = ServerUtils.BuildXmlResponse(result);
//m_log.DebugFormat("[GRID USER HANDLER]: resp string: {0}", xmlString); //m_log.DebugFormat("[GRID USER HANDLER]: resp string: {0}", xmlString);
return Util.UTF8NoBomEncoding.GetBytes(xmlString); return Util.UTF8NoBomEncoding.GetBytes(xmlString);
} }

5
OpenSim/Services/UserAccountService/GridUserService.cs
View File

@ -58,17 +58,14 @@ namespace OpenSim.Services.UserAccountService
{ {
GridUserData[] ds = m_Database.GetAll(userID); GridUserData[] ds = m_Database.GetAll(userID);
if (ds == null) if (ds == null)
{
m_log.DebugFormat("[GRID USER SERVICE]: user not found {0}", userID);
return null; return null;
}
if (ds.Length > 0) if (ds.Length > 0)
{ {
d = ds[0]; d = ds[0];
foreach (GridUserData dd in ds) foreach (GridUserData dd in ds)
if (dd.UserID.Length > d.UserID.Length) // find the longest if (dd.UserID.Length > d.UserID.Length) // find the longest
d = dd; d = dd;
m_log.DebugFormat("[GRID USER SERVICE]: Found user {0}", d.UserID);
} }
} }