diff options
| author | Justin Clarke Casey | 2009-02-12 18:54:48 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2009-02-12 18:54:48 +0000 |
| commit | 6db1f3c6a6d34ba292bd509f1402fe4615bd173e (patch) | |
| tree | ccbb2eb948759de29e1109c22b06b1de92df481d /OpenSim/Framework | |
| parent | Commented a couple of not very useful log messages that are cluttering the lo... (diff) | |
| download | opensim-SC_OLD-6db1f3c6a6d34ba292bd509f1402fe4615bd173e.zip opensim-SC_OLD-6db1f3c6a6d34ba292bd509f1402fe4615bd173e.tar.gz opensim-SC_OLD-6db1f3c6a6d34ba292bd509f1402fe4615bd173e.tar.bz2 opensim-SC_OLD-6db1f3c6a6d34ba292bd509f1402fe4615bd173e.tar.xz | |
* Lock remaining m_rpcHandlers use since these accesses are not guaranteed to be thread safe
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Servers/BaseHttpServer.cs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index e0cc697..d6f0630 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs | |||
| @@ -605,9 +605,15 @@ namespace OpenSim.Framework.Servers | |||
| 605 | { | 605 | { |
| 606 | xmlRprcRequest.Params.Add(request.RemoteIPEndPoint); // Param[1] | 606 | xmlRprcRequest.Params.Add(request.RemoteIPEndPoint); // Param[1] |
| 607 | XmlRpcResponse xmlRpcResponse; | 607 | XmlRpcResponse xmlRpcResponse; |
| 608 | 608 | ||
| 609 | XmlRpcMethod method; | 609 | XmlRpcMethod method; |
| 610 | if (m_rpcHandlers.TryGetValue(methodName, out method)) | 610 | bool methodWasFound; |
| 611 | lock (m_rpcHandlers) | ||
| 612 | { | ||
| 613 | methodWasFound = m_rpcHandlers.TryGetValue(methodName, out method); | ||
| 614 | } | ||
| 615 | |||
| 616 | if (methodWasFound) | ||
| 611 | { | 617 | { |
| 612 | xmlRprcRequest.Params.Add(request.Url); // Param[2] | 618 | xmlRprcRequest.Params.Add(request.Url); // Param[2] |
| 613 | 619 | ||