OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Refactor: Remove redundant try/catch from asset request since this is now handled by the base http server

0.6.0-stable
Justin Clarke Casey 2008-04-18 15:41:13 +00:00
parent acb0b06fed
commit afb06c7b88
1 changed files with 42 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
OpenSim/Grid/AssetServer/RestService.cs
View File

@ -62,60 +62,55 @@ namespace OpenSim.Grid.AssetServer
{ {
string param = GetParam(path); string param = GetParam(path);
byte[] result = new byte[] {}; byte[] result = new byte[] {};
try
string[] p = param.Split(new char[] {'/', '?', '&'}, StringSplitOptions.RemoveEmptyEntries);
if (p.Length > 0)
{ {
string[] p = param.Split(new char[] {'/', '?', '&'}, StringSplitOptions.RemoveEmptyEntries); LLUUID assetID = null;
if (p.Length > 0) if (!LLUUID.TryParse(p[0], out assetID))
{ {
LLUUID assetID = null; m_log.InfoFormat(
"[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]);
return result;
}
if (StatsManager.AssetStats != null)
StatsManager.AssetStats.AddRequest();
AssetBase asset = m_assetProvider.FetchAsset(assetID);
if (asset != null)
{
XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
MemoryStream ms = new MemoryStream();
XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8);
xw.Formatting = Formatting.Indented;
xs.Serialize(xw, asset);
xw.Flush();
ms.Seek(0, SeekOrigin.Begin);
//StreamReader sr = new StreamReader(ms);
result = ms.GetBuffer();
if (!LLUUID.TryParse(p[0], out assetID)) m_log.InfoFormat(
{ "[REST]: GET:/asset found {0} with name {1}, size {2} bytes",
m_log.InfoFormat( assetID, asset.Name, result.Length);
"[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]);
return result; Array.Resize<byte>(ref result, (int) ms.Length);
} }
else
{
if (StatsManager.AssetStats != null) if (StatsManager.AssetStats != null)
StatsManager.AssetStats.AddRequest(); StatsManager.AssetStats.AddNotFoundRequest();
AssetBase asset = m_assetProvider.FetchAsset(assetID); m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID);
if (asset != null)
{
XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
MemoryStream ms = new MemoryStream();
XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8);
xw.Formatting = Formatting.Indented;
xs.Serialize(xw, asset);
xw.Flush();
ms.Seek(0, SeekOrigin.Begin);
//StreamReader sr = new StreamReader(ms);
result = ms.GetBuffer();
m_log.InfoFormat(
"[REST]: GET:/asset found {0} with name {1}, size {2} bytes",
assetID, asset.Name, result.Length);
Array.Resize<byte>(ref result, (int) ms.Length);
}
else
{
if (StatsManager.AssetStats != null)
StatsManager.AssetStats.AddNotFoundRequest();
m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID);
}
} }
} }
catch (Exception e)
{ return result;
m_log.Error(e.ToString()); }
}
return result;
}
} }
public class PostAssetStreamHandler : BaseStreamHandler public class PostAssetStreamHandler : BaseStreamHandler