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

improve locking of m_agentHandlers in BaseHttpServer

bulletsim
Justin Clark-Casey (justincc) 2011-08-22 02:07:51 +01:00
parent f9a367e2f6
commit 9469c62098
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
View File

@ -66,7 +66,6 @@ namespace OpenSim.Framework.Servers.HttpServer
protected Dictionary<string, IRequestHandler> m_streamHandlers = new Dictionary<string, IRequestHandler>(); protected Dictionary<string, IRequestHandler> m_streamHandlers = new Dictionary<string, IRequestHandler>();
protected Dictionary<string, GenericHTTPMethod> m_HTTPHandlers = new Dictionary<string, GenericHTTPMethod>(); protected Dictionary<string, GenericHTTPMethod> m_HTTPHandlers = new Dictionary<string, GenericHTTPMethod>();
protected Dictionary<string, IHttpAgentHandler> m_agentHandlers = new Dictionary<string, IHttpAgentHandler>(); protected Dictionary<string, IHttpAgentHandler> m_agentHandlers = new Dictionary<string, IHttpAgentHandler>();
protected Dictionary<string, PollServiceEventArgs> m_pollHandlers = protected Dictionary<string, PollServiceEventArgs> m_pollHandlers =
new Dictionary<string, PollServiceEventArgs>(); new Dictionary<string, PollServiceEventArgs>();
@ -247,7 +246,6 @@ namespace OpenSim.Framework.Servers.HttpServer
return new List<string>(m_pollHandlers.Keys); return new List<string>(m_pollHandlers.Keys);
} }
// Note that the agent string is provided simply to differentiate // Note that the agent string is provided simply to differentiate
// the handlers - it is NOT required to be an actual agent header // the handlers - it is NOT required to be an actual agent header
// value. // value.
@ -268,7 +266,8 @@ namespace OpenSim.Framework.Servers.HttpServer
public List<string> GetAgentHandlerKeys() public List<string> GetAgentHandlerKeys()
{ {
return new List<string>(m_agentHandlers.Keys); lock (m_agentHandlers)
return new List<string>(m_agentHandlers.Keys);
} }
public bool AddLLSDHandler(string path, LLSDMethod handler) public bool AddLLSDHandler(string path, LLSDMethod handler)
@ -749,7 +748,8 @@ namespace OpenSim.Framework.Servers.HttpServer
private bool TryGetAgentHandler(OSHttpRequest request, OSHttpResponse response, out IHttpAgentHandler agentHandler) private bool TryGetAgentHandler(OSHttpRequest request, OSHttpResponse response, out IHttpAgentHandler agentHandler)
{ {
agentHandler = null; agentHandler = null;
try
lock (m_agentHandlers)
{ {
foreach (IHttpAgentHandler handler in m_agentHandlers.Values) foreach (IHttpAgentHandler handler in m_agentHandlers.Values)
{ {
@ -760,9 +760,6 @@ namespace OpenSim.Framework.Servers.HttpServer
} }
} }
} }
catch(KeyNotFoundException)
{
}
return false; return false;
} }
@ -1829,10 +1826,13 @@ namespace OpenSim.Framework.Servers.HttpServer
{ {
try try
{ {
if (handler == m_agentHandlers[agent]) lock (m_agentHandlers)
{ {
m_agentHandlers.Remove(agent); if (handler == m_agentHandlers[agent])
return true; {
m_agentHandlers.Remove(agent);
return true;
}
} }
} }
catch(KeyNotFoundException) catch(KeyNotFoundException)