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

Merge branch 'diva-textures-osgrid'

Browse Source
This commit is contained in:
Melanie
2009-10-02 23:25:17 +01:00
parent ce8974539e 7a2ac292d6
commit 73fa409318
3 changed files with 161 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenSim/Framework/Servers/HttpServer/AsynchronousRestObjectRequester.cs
View File

@@ -91,24 +91,31 @@ namespace OpenSim.Framework.Servers.HttpServer
Stream requestStream = request.EndGetRequestStream(res);
requestStream.Write(buffer.ToArray(), 0, length);
requestStream.Close();
request.BeginGetResponse(delegate(IAsyncResult ar)
{
response = request.EndGetResponse(ar);
Stream respStream = null;
try
{
deserial = (TResponse) deserializer.Deserialize(
response.GetResponseStream());
respStream = response.GetResponseStream();
deserial = (TResponse)deserializer.Deserialize(
respStream);
}
catch (System.InvalidOperationException)
{
}
finally
{
respStream.Close();
response.Close();
}
action(deserial);
}, null);
}, null);
return;
}
@@ -119,14 +126,21 @@ namespace OpenSim.Framework.Servers.HttpServer
// If the server returns a 404, this appears to trigger a System.Net.WebException even though that isn't
// documented in MSDN
response = request.EndGetResponse(res2);
Stream respStream = null;
try
{
deserial = (TResponse)deserializer.Deserialize(response.GetResponseStream());
respStream = response.GetResponseStream();
deserial = (TResponse)deserializer.Deserialize(respStream);
}
catch (System.InvalidOperationException)
{
}
finally
{
respStream.Close();
response.Close();
}
}
catch (WebException e)
{