diff options
author | Justin Clark-Casey (justincc) | 2011-08-22 01:59:40 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-22 01:59:40 +0100 |
commit | f9a367e2f6aa41f9ec379e2ff5b6b22303daf2f6 (patch) | |
tree | 6fedb21d730b2a696c8d38ee0b5ffe28c48bf1c3 | |
parent | improve locking of m_streamHandlers in BaseHttpServer (diff) | |
download | opensim-SC_OLD-f9a367e2f6aa41f9ec379e2ff5b6b22303daf2f6.zip opensim-SC_OLD-f9a367e2f6aa41f9ec379e2ff5b6b22303daf2f6.tar.gz opensim-SC_OLD-f9a367e2f6aa41f9ec379e2ff5b6b22303daf2f6.tar.bz2 opensim-SC_OLD-f9a367e2f6aa41f9ec379e2ff5b6b22303daf2f6.tar.xz |
improve locking of m_HTTPHandlers in BaseHttpServer
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 988d859..22417b6 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -220,10 +220,10 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
220 | 220 | ||
221 | public List<string> GetHTTPHandlerKeys() | 221 | public List<string> GetHTTPHandlerKeys() |
222 | { | 222 | { |
223 | return new List<string>(m_HTTPHandlers.Keys); | 223 | lock (m_HTTPHandlers) |
224 | return new List<string>(m_HTTPHandlers.Keys); | ||
224 | } | 225 | } |
225 | 226 | ||
226 | |||
227 | public bool AddPollServiceHTTPHandler(string methodName, GenericHTTPMethod handler, PollServiceEventArgs args) | 227 | public bool AddPollServiceHTTPHandler(string methodName, GenericHTTPMethod handler, PollServiceEventArgs args) |
228 | { | 228 | { |
229 | bool pollHandlerResult = false; | 229 | bool pollHandlerResult = false; |