diff options
| author | Melanie | 2011-10-25 03:26:51 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 03:26:51 +0100 |
| commit | 27aca49a1f27fdd1c2002cd509fcf90a7379f758 (patch) | |
| tree | 5359925a6e05c223cfe591805043b098961c10e0 | |
| parent | Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmerge (diff) | |
| parent | Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer() (diff) | |
| download | opensim-SC-27aca49a1f27fdd1c2002cd509fcf90a7379f758.zip opensim-SC-27aca49a1f27fdd1c2002cd509fcf90a7379f758.tar.gz opensim-SC-27aca49a1f27fdd1c2002cd509fcf90a7379f758.tar.bz2 opensim-SC-27aca49a1f27fdd1c2002cd509fcf90a7379f758.tar.xz | |
Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmerge
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 33dec8d..b45ed7b 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -1837,12 +1837,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 1837 | public void RemovePollServiceHTTPHandler(string httpMethod, string path) | 1837 | public void RemovePollServiceHTTPHandler(string httpMethod, string path) |
| 1838 | { | 1838 | { |
| 1839 | lock (m_pollHandlers) | 1839 | lock (m_pollHandlers) |
| 1840 | { | 1840 | m_pollHandlers.Remove(path); |
| 1841 | if (m_pollHandlers.ContainsKey(path)) | ||
| 1842 | { | ||
| 1843 | m_pollHandlers.Remove(path); | ||
| 1844 | } | ||
| 1845 | } | ||
| 1846 | 1841 | ||
| 1847 | RemoveHTTPHandler(httpMethod, path); | 1842 | RemoveHTTPHandler(httpMethod, path); |
| 1848 | } | 1843 | } |
| @@ -1866,12 +1861,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 1866 | public void RemoveXmlRPCHandler(string method) | 1861 | public void RemoveXmlRPCHandler(string method) |
| 1867 | { | 1862 | { |
| 1868 | lock (m_rpcHandlers) | 1863 | lock (m_rpcHandlers) |
| 1869 | { | 1864 | m_rpcHandlers.Remove(method); |
| 1870 | if (m_rpcHandlers.ContainsKey(method)) | ||
| 1871 | { | ||
| 1872 | m_rpcHandlers.Remove(method); | ||
| 1873 | } | ||
| 1874 | } | ||
| 1875 | } | 1865 | } |
| 1876 | 1866 | ||
| 1877 | public bool RemoveLLSDHandler(string path, LLSDMethod handler) | 1867 | public bool RemoveLLSDHandler(string path, LLSDMethod handler) |