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

oops, fix build break from last commit

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

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

@ -56,7 +56,6 @@ namespace OpenSim.Framework.Servers.HttpServer
private volatile int NotSocketErrors = 0; private volatile int NotSocketErrors = 0;
public volatile bool HTTPDRunning = false; public volatile bool HTTPDRunning = false;
protected Thread m_workerThread;
// protected HttpListener m_httpListener; // protected HttpListener m_httpListener;
protected CoolHTTPListener m_httpListener2; protected CoolHTTPListener m_httpListener2;
protected Dictionary<string, XmlRpcMethod> m_rpcHandlers = new Dictionary<string, XmlRpcMethod>(); protected Dictionary<string, XmlRpcMethod> m_rpcHandlers = new Dictionary<string, XmlRpcMethod>();
@ -243,7 +242,8 @@ namespace OpenSim.Framework.Servers.HttpServer
public List<string> GetPollServiceHandlerKeys() public List<string> GetPollServiceHandlerKeys()
{ {
return new List<string>(m_pollHandlers.Keys); lock (m_pollHandlers)
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
@ -1824,20 +1824,16 @@ namespace OpenSim.Framework.Servers.HttpServer
public bool RemoveAgentHandler(string agent, IHttpAgentHandler handler) public bool RemoveAgentHandler(string agent, IHttpAgentHandler handler)
{ {
try lock (m_agentHandlers)
{ {
lock (m_agentHandlers) IHttpAgentHandler foundHandler;
if (m_agentHandlers.TryGetValue(agent, out foundHandler) && foundHandler == handler)
{ {
if (handler == m_agentHandlers[agent]) m_agentHandlers.Remove(agent);
{ return true;
m_agentHandlers.Remove(agent);
return true;
}
} }
} }
catch(KeyNotFoundException)
{
}
return false; return false;
} }