From 94a8ab80c844274de4a3cc11b9be9f25e786c77e Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Mon, 22 Aug 2011 01:43:34 +0100
Subject: [PATCH] improve locking of m_rpcHandlers in BaseHttpServer

---
 OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index cb1117ae55..85fb36462a 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -196,7 +196,8 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         public List<string> GetXmlRpcHandlerKeys()
         {
-            return new List<string>(m_rpcHandlers.Keys);
+            lock (m_rpcHandlers)
+                return new List<string>(m_rpcHandlers.Keys);
         }
 
         public bool AddHTTPHandler(string methodName, GenericHTTPMethod handler)