ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Optimized usings

Browse Source 
* Shortened type references
* Removed redundant 'this' qualifier
This commit is contained in:
lbsa71
2007-10-30 09:05:31 +00:00
parent c32d1f0562
commit 67e12b95ea
353 changed files with 15459 additions and 10338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@@ -31,11 +31,10 @@ using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
using System.Xml;
using Nwc.XmlRpc;
using OpenSim.Framework.Console;
using System.Xml;
namespace OpenSim.Framework.Servers
{
@@ -50,7 +49,7 @@ namespace OpenSim.Framework.Servers
public int Port
{
get { return m_port; }
get { return m_port; }
}
public BaseHttpServer(int port)
@@ -58,11 +57,11 @@ namespace OpenSim.Framework.Servers
m_port = port;
}
public void AddStreamHandler( IStreamHandler handler)
public void AddStreamHandler(IStreamHandler handler)
{
string httpMethod = handler.HttpMethod;
string path = handler.Path;
string handlerKey = GetHandlerKey(httpMethod, path);
m_streamHandlers.Add(handlerKey, handler);
}
@@ -74,9 +73,9 @@ namespace OpenSim.Framework.Servers
public bool AddXmlRPCHandler(string method, XmlRpcMethod handler)
{
if (!this.m_rpcHandlers.ContainsKey(method))
if (!m_rpcHandlers.ContainsKey(method))
{
this.m_rpcHandlers.Add(method, handler);
m_rpcHandlers.Add(method, handler);
return true;
}
@@ -87,7 +86,7 @@ namespace OpenSim.Framework.Servers
public virtual void HandleRequest(Object stateinfo)
{
HttpListenerContext context = (HttpListenerContext)stateinfo;
HttpListenerContext context = (HttpListenerContext) stateinfo;
HttpListenerRequest request = context.Request;
HttpListenerResponse response = context.Response;
@@ -96,11 +95,11 @@ namespace OpenSim.Framework.Servers
response.SendChunked = false;
string path = request.RawUrl;
string handlerKey = GetHandlerKey( request.HttpMethod, path );
string handlerKey = GetHandlerKey(request.HttpMethod, path);
IStreamHandler streamHandler;
if (TryGetStreamHandler( handlerKey, out streamHandler))
if (TryGetStreamHandler(handlerKey, out streamHandler))
{
byte[] buffer = streamHandler.Handle(path, request.InputStream);
request.InputStream.Close();
@@ -159,11 +158,11 @@ namespace OpenSim.Framework.Servers
try
{
xmlRprcRequest = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(requestBody);
xmlRprcRequest = (XmlRpcRequest) (new XmlRpcRequestDeserializer()).Deserialize(requestBody);
}
catch ( XmlException e )
{
responseString = String.Format( "XmlException:\n{0}",e.Message );
catch (XmlException e)
{
responseString = String.Format("XmlException:\n{0}", e.Message);
}
if (xmlRprcRequest != null)
@@ -173,7 +172,7 @@ namespace OpenSim.Framework.Servers
XmlRpcResponse xmlRpcResponse;
XmlRpcMethod method;
if (this.m_rpcHandlers.TryGetValue(methodName, out method))
if (m_rpcHandlers.TryGetValue(methodName, out method))
{
xmlRpcResponse = method(xmlRprcRequest);
}
@@ -181,7 +180,8 @@ namespace OpenSim.Framework.Servers
{
xmlRpcResponse = new XmlRpcResponse();
Hashtable unknownMethodError = new Hashtable();
unknownMethodError["reason"] = "XmlRequest"; ;
unknownMethodError["reason"] = "XmlRequest";
;
unknownMethodError["message"] = "Unknown Rpc Request [" + methodName + "]";
unknownMethodError["login"] = "false";
xmlRpcResponse.Value = unknownMethodError;
@@ -249,4 +249,4 @@ namespace OpenSim.Framework.Servers
m_streamHandlers.Remove(GetHandlerKey(httpMethod, path));
}
}
}
}