aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-08-22 01:43:34 +0100
committerJustin Clark-Casey (justincc)2011-08-22 01:43:34 +0100
commit94a8ab80c844274de4a3cc11b9be9f25e786c77e (patch)
treecd611eec995c354c0404e5c848ce2316e383e131 /OpenSim
parentminor: Add explanative text for the new currency parameter. Convert some tab... (diff)
downloadopensim-SC_OLD-94a8ab80c844274de4a3cc11b9be9f25e786c77e.zip
opensim-SC_OLD-94a8ab80c844274de4a3cc11b9be9f25e786c77e.tar.gz
opensim-SC_OLD-94a8ab80c844274de4a3cc11b9be9f25e786c77e.tar.bz2
opensim-SC_OLD-94a8ab80c844274de4a3cc11b9be9f25e786c77e.tar.xz
improve locking of m_rpcHandlers in BaseHttpServer
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index cb1117a..85fb364 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -196,7 +196,8 @@ namespace OpenSim.Framework.Servers.HttpServer
196 196
197 public List<string> GetXmlRpcHandlerKeys() 197 public List<string> GetXmlRpcHandlerKeys()
198 { 198 {
199 return new List<string>(m_rpcHandlers.Keys); 199 lock (m_rpcHandlers)
200 return new List<string>(m_rpcHandlers.Keys);
200 } 201 }
201 202
202 public bool AddHTTPHandler(string methodName, GenericHTTPMethod handler) 203 public bool AddHTTPHandler(string methodName, GenericHTTPMethod handler)