aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-03-19 18:11:44 +0000
committerJustin Clarke Casey2009-03-19 18:11:44 +0000
commitbd2180d9af21dd54d4199a9381afa3e43e913823 (patch)
tree7f82f0dd30e24d8eaa4f8cbb2493cb2f3f1c637f /OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
parent* Lock http handlers dictionary in other places as well to avoid race conditions (diff)
downloadopensim-SC-bd2180d9af21dd54d4199a9381afa3e43e913823.zip
opensim-SC-bd2180d9af21dd54d4199a9381afa3e43e913823.tar.gz
opensim-SC-bd2180d9af21dd54d4199a9381afa3e43e913823.tar.bz2
opensim-SC-bd2180d9af21dd54d4199a9381afa3e43e913823.tar.xz
* refactor: Create IHttpServer interface instead of accessing BaseHttpServer via CommunicationsManager directly
Diffstat (limited to 'OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
index ed31c45..b47d014 100644
--- a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
+++ b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
@@ -28,6 +28,7 @@
28using System.Collections; 28using System.Collections;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenSim.Framework.Servers; 30using OpenSim.Framework.Servers;
31using OpenSim.Framework.Servers.Interfaces;
31 32
32namespace OpenSim.Framework.Communications.Capabilities 33namespace OpenSim.Framework.Communications.Capabilities
33{ 34{
@@ -39,7 +40,7 @@ namespace OpenSim.Framework.Communications.Capabilities
39 public class CapsHandlers 40 public class CapsHandlers
40 { 41 {
41 private Dictionary <string, IRequestHandler> m_capsHandlers = new Dictionary<string, IRequestHandler>(); 42 private Dictionary <string, IRequestHandler> m_capsHandlers = new Dictionary<string, IRequestHandler>();
42 private BaseHttpServer m_httpListener; 43 private IHttpServer m_httpListener;
43 private string m_httpListenerHostName; 44 private string m_httpListenerHostName;
44 private uint m_httpListenerPort; 45 private uint m_httpListenerPort;
45 private bool m_useSSL = false; 46 private bool m_useSSL = false;
@@ -67,7 +68,7 @@ namespace OpenSim.Framework.Communications.Capabilities
67 /// <param name="httpListenerHostname">host name of the HTTP 68 /// <param name="httpListenerHostname">host name of the HTTP
68 /// server</param> 69 /// server</param>
69 /// <param name="httpListenerPort">HTTP port</param> 70 /// <param name="httpListenerPort">HTTP port</param>
70 public CapsHandlers(BaseHttpServer httpListener, string httpListenerHostname, uint httpListenerPort, bool https) 71 public CapsHandlers(IHttpServer httpListener, string httpListenerHostname, uint httpListenerPort, bool https)
71 { 72 {
72 m_httpListener = httpListener; 73 m_httpListener = httpListener;
73 m_httpListenerHostName = httpListenerHostname; 74 m_httpListenerHostName = httpListenerHostname;