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

Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmerge

avinationmerge
Melanie 2011-10-25 03:26:51 +01:00
parent c8dfef1583 e14cb45b9b
commit 27aca49a1f
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1837,12 +1837,7 @@ namespace OpenSim.Framework.Servers.HttpServer
public void RemovePollServiceHTTPHandler(string httpMethod, string path) public void RemovePollServiceHTTPHandler(string httpMethod, string path)
{ {
lock (m_pollHandlers) lock (m_pollHandlers)
{ m_pollHandlers.Remove(path);
if (m_pollHandlers.ContainsKey(path))
{
m_pollHandlers.Remove(path);
}
}
RemoveHTTPHandler(httpMethod, path); RemoveHTTPHandler(httpMethod, path);
} }
@ -1866,12 +1861,7 @@ namespace OpenSim.Framework.Servers.HttpServer
public void RemoveXmlRPCHandler(string method) public void RemoveXmlRPCHandler(string method)
{ {
lock (m_rpcHandlers) lock (m_rpcHandlers)
{ m_rpcHandlers.Remove(method);
if (m_rpcHandlers.ContainsKey(method))
{
m_rpcHandlers.Remove(method);
}
}
} }
public bool RemoveLLSDHandler(string path, LLSDMethod handler) public bool RemoveLLSDHandler(string path, LLSDMethod handler)