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

* Add necessary locking to BaseHttpServer.RemoveHTTPHandler()

0.6.5-rc1
Justin Clarke Casey 2009-03-19 16:51:21 +00:00
parent eb0c369409
commit 1e6056c24b
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@ -180,7 +180,7 @@ namespace OpenSim.Framework.Servers
/// ///
/// http://<hostname>:<port><method> /// http://<hostname>:<port><method>
/// ///
/// if the method starts with a slash. For example, AddHTTPHandler("/object/", ...) on a standalone region /// if the method name starts with a slash. For example, AddHTTPHandler("/object/", ...) on a standalone region
/// server will register a handler that can be invoked with either /// server will register a handler that can be invoked with either
/// ///
/// http://localhost:9000/?method=/object/ /// http://localhost:9000/?method=/object/
@ -1504,15 +1504,23 @@ namespace OpenSim.Framework.Servers
lock (m_streamHandlers) m_streamHandlers.Remove(handlerKey); lock (m_streamHandlers) m_streamHandlers.Remove(handlerKey);
} }
/// <summary>
/// Remove an HTTP handler
/// </summary>
/// <param name="httpMethod"></param>
/// <param name="path"></param>
public void RemoveHTTPHandler(string httpMethod, string path) public void RemoveHTTPHandler(string httpMethod, string path)
{ {
if (httpMethod != null && httpMethod.Length == 0) lock (m_HTTPHandlers)
{ {
m_HTTPHandlers.Remove(path); if (httpMethod != null && httpMethod.Length == 0)
return; {
} m_HTTPHandlers.Remove(path);
return;
}
m_HTTPHandlers.Remove(GetHandlerKey(httpMethod, path)); m_HTTPHandlers.Remove(GetHandlerKey(httpMethod, path));
}
} }
/// <summary> /// <summary>
@ -1540,7 +1548,6 @@ namespace OpenSim.Framework.Servers
public bool RemoveLLSDHandler(string path, LLSDMethod handler) public bool RemoveLLSDHandler(string path, LLSDMethod handler)
{ {
try try
{ {
if (handler == m_llsdHandlers[path]) if (handler == m_llsdHandlers[path])