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

Protect against null requests

cpu-performance
Diva Canto 2013-07-15 11:37:49 -07:00
parent ac73e70293
commit fbb01bd280
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs
View File

@ -140,11 +140,13 @@ namespace OpenSim.Region.CoreModules.Framework
Watchdog.UpdateThread(); Watchdog.UpdateThread();
GridRegionRequest request = m_RequestQueue.Dequeue(); GridRegionRequest request = m_RequestQueue.Dequeue();
GridRegion r = m_scenes[0].GridService.GetRegionByUUID(UUID.Zero, request.regionID); if (request != null)
{
if (r != null && r.RegionHandle != 0) GridRegion r = m_scenes[0].GridService.GetRegionByUUID(UUID.Zero, request.regionID);
request.client.SendRegionHandle(request.regionID, r.RegionHandle);
if (r != null && r.RegionHandle != 0)
request.client.SendRegionHandle(request.regionID, r.RegionHandle);
}
} }
} }
} }

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

@ -681,17 +681,19 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
Watchdog.UpdateThread(); Watchdog.UpdateThread();
NameRequest request = m_RequestQueue.Dequeue(); NameRequest request = m_RequestQueue.Dequeue();
string[] names; if (request != null)
bool foundRealName = TryGetUserNames(request.uuid, out names);
if (names.Length == 2)
{ {
if (!foundRealName) string[] names;
m_log.DebugFormat("[USER MANAGEMENT MODULE]: Sending {0} {1} for {2} to {3} since no bound name found", names[0], names[1], request.uuid, request.client.Name); bool foundRealName = TryGetUserNames(request.uuid, out names);
request.client.SendNameReply(request.uuid, names[0], names[1]); if (names.Length == 2)
{
if (!foundRealName)
m_log.DebugFormat("[USER MANAGEMENT MODULE]: Sending {0} {1} for {2} to {3} since no bound name found", names[0], names[1], request.uuid, request.client.Name);
request.client.SendNameReply(request.uuid, names[0], names[1]);
}
} }
} }
} }