diff options
author | Jeff Ames | 2008-05-30 08:35:57 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-30 08:35:57 +0000 |
commit | 04625109560fb54d613b1fc9c81a8a9f387720c9 (patch) | |
tree | af00035a676beee3542a55cd13ce09e57f1ad778 /OpenSim/Framework/Servers/BaseHttpServer.cs | |
parent | thanks krtaylor for a (diff) | |
download | opensim-SC-04625109560fb54d613b1fc9c81a8a9f387720c9.zip opensim-SC-04625109560fb54d613b1fc9c81a8a9f387720c9.tar.gz opensim-SC-04625109560fb54d613b1fc9c81a8a9f387720c9.tar.bz2 opensim-SC-04625109560fb54d613b1fc9c81a8a9f387720c9.tar.xz |
Update svn properties. Formatting cleanup.
Diffstat (limited to 'OpenSim/Framework/Servers/BaseHttpServer.cs')
-rw-r--r-- | OpenSim/Framework/Servers/BaseHttpServer.cs | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index e57682f..ce351ca 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs | |||
@@ -84,7 +84,8 @@ namespace OpenSim.Framework.Servers | |||
84 | 84 | ||
85 | string handlerKey = GetHandlerKey(httpMethod, path); | 85 | string handlerKey = GetHandlerKey(httpMethod, path); |
86 | 86 | ||
87 | lock(m_streamHandlers) { | 87 | lock (m_streamHandlers) |
88 | { | ||
88 | if (!m_streamHandlers.ContainsKey(handlerKey)) | 89 | if (!m_streamHandlers.ContainsKey(handlerKey)) |
89 | { | 90 | { |
90 | //m_log.DebugFormat("[BASE HTTP SERVER]: Adding handler key {0}", handlerKey); | 91 | //m_log.DebugFormat("[BASE HTTP SERVER]: Adding handler key {0}", handlerKey); |
@@ -100,7 +101,8 @@ namespace OpenSim.Framework.Servers | |||
100 | 101 | ||
101 | public bool AddXmlRPCHandler(string method, XmlRpcMethod handler) | 102 | public bool AddXmlRPCHandler(string method, XmlRpcMethod handler) |
102 | { | 103 | { |
103 | lock(m_rpcHandlers) { | 104 | lock (m_rpcHandlers) |
105 | { | ||
104 | if (!m_rpcHandlers.ContainsKey(method)) | 106 | if (!m_rpcHandlers.ContainsKey(method)) |
105 | { | 107 | { |
106 | m_rpcHandlers.Add(method, handler); | 108 | m_rpcHandlers.Add(method, handler); |
@@ -114,7 +116,8 @@ namespace OpenSim.Framework.Servers | |||
114 | 116 | ||
115 | public bool AddHTTPHandler(string method, GenericHTTPMethod handler) | 117 | public bool AddHTTPHandler(string method, GenericHTTPMethod handler) |
116 | { | 118 | { |
117 | lock(m_HTTPHandlers) { | 119 | lock (m_HTTPHandlers) |
120 | { | ||
118 | if (!m_HTTPHandlers.ContainsKey(method)) | 121 | if (!m_HTTPHandlers.ContainsKey(method)) |
119 | { | 122 | { |
120 | m_HTTPHandlers.Add(method, handler); | 123 | m_HTTPHandlers.Add(method, handler); |
@@ -132,7 +135,8 @@ namespace OpenSim.Framework.Servers | |||
132 | 135 | ||
133 | public bool AddAgentHandler(string agent, IHttpAgentHandler handler) | 136 | public bool AddAgentHandler(string agent, IHttpAgentHandler handler) |
134 | { | 137 | { |
135 | lock(m_agentHandlers) { | 138 | lock (m_agentHandlers) |
139 | { | ||
136 | if (!m_agentHandlers.ContainsKey(agent)) | 140 | if (!m_agentHandlers.ContainsKey(agent)) |
137 | { | 141 | { |
138 | m_agentHandlers.Add(agent, handler); | 142 | m_agentHandlers.Add(agent, handler); |
@@ -171,7 +175,8 @@ namespace OpenSim.Framework.Servers | |||
171 | 175 | ||
172 | if (TryGetAgentHandler(request, response, out agentHandler)) | 176 | if (TryGetAgentHandler(request, response, out agentHandler)) |
173 | { | 177 | { |
174 | if (HandleAgentRequest(agentHandler, request, response)) { | 178 | if (HandleAgentRequest(agentHandler, request, response)) |
179 | { | ||
175 | m_log.DebugFormat("[HTTP-AGENT] Handler located for {0}", request.UserAgent); | 180 | m_log.DebugFormat("[HTTP-AGENT] Handler located for {0}", request.UserAgent); |
176 | return; | 181 | return; |
177 | } | 182 | } |