ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Added some GetAssetStreamHandlerTests

Browse Source 
* Minor tweaks to attain testability
This commit is contained in:
lbsa71
2009-05-06 17:02:51 +00:00
parent c84abfa9b1
commit 1afdf2ee1f
5 changed files with 57 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Framework/Servers/GetAssetStreamHandler.cs
View File

@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Servers
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
// private OpenAsset_Main m_assetManager;
private IAssetDataPlugin m_assetProvider;
private readonly IAssetDataPlugin m_assetProvider;
/// <summary>
/// Constructor.
@@ -58,7 +58,7 @@ namespace OpenSim.Framework.Servers
public GetAssetStreamHandler(IAssetDataPlugin assetProvider)
: base("GET", "/assets")
{
m_log.Info("[REST]: In Get Request");
// m_log.Info("[REST]: In Get Request");
// m_assetManager = assetManager;
m_assetProvider = assetProvider;
}
@@ -66,10 +66,9 @@ namespace OpenSim.Framework.Servers
public override byte[] Handle(string path, Stream request,
OSHttpRequest httpRequest, OSHttpResponse httpResponse)
{
string param = GetParam(path);
byte[] result = new byte[] { };
string[] p = param.Split(new char[] { '/', '?', '&' }, StringSplitOptions.RemoveEmptyEntries);
string[] p = SplitParams(path);
if (p.Length > 0)
{
@@ -127,6 +126,13 @@ namespace OpenSim.Framework.Servers
return result;
}
public string[] SplitParams(string path)
{
string param = GetParam(path);
return param.Split(new char[] { '/', '?', '&' }, StringSplitOptions.RemoveEmptyEntries);
}
// private byte[] ProcessOutgoingAssetData(byte[] assetData)
// {
// string data = Encoding.ASCII.GetString(assetData);