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

Fixed a case where logging an HTTP response failed because the stream was non-seekable

0.8.0.3
Oren Hurvitz 2014-03-27 17:46:37 +02:00
parent 76add0fdb0
commit 161c827a44
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
OpenSim/Framework/WebUtil.cs
View File

@ -41,6 +41,7 @@ using System.Xml;
using System.Xml.Serialization; using System.Xml.Serialization;
using log4net; using log4net;
using OpenMetaverse.StructuredData; using OpenMetaverse.StructuredData;
using XMLResponseHelper = OpenSim.Framework.SynchronousRestObjectRequester.XMLResponseHelper;
namespace OpenSim.Framework namespace OpenSim.Framework
{ {
@ -793,7 +794,6 @@ namespace OpenSim.Framework
ht.ServicePoint.ConnectionLimit = maxConnections; ht.ServicePoint.ConnectionLimit = maxConnections;
TResponse deserial = default(TResponse); TResponse deserial = default(TResponse);
XmlSerializer deserializer = new XmlSerializer(typeof(TResponse));
request.Method = verb; request.Method = verb;
@ -840,9 +840,7 @@ namespace OpenSim.Framework
{ {
using (Stream respStream = response.GetResponseStream()) using (Stream respStream = response.GetResponseStream())
{ {
if (WebUtil.DebugLevel >= 5) deserial = XMLResponseHelper.LogAndDeserialize<TRequest, TResponse>(respStream, response.ContentLength);
WebUtil.LogResponseDetail(respStream);
deserial = (TResponse)deserializer.Deserialize(respStream);
} }
} }
catch (System.InvalidOperationException) catch (System.InvalidOperationException)
@ -869,9 +867,7 @@ namespace OpenSim.Framework
{ {
using (Stream respStream = response.GetResponseStream()) using (Stream respStream = response.GetResponseStream())
{ {
if (WebUtil.DebugLevel >= 5) deserial = XMLResponseHelper.LogAndDeserialize<TRequest, TResponse>(respStream, response.ContentLength);
WebUtil.LogResponseDetail(respStream);
deserial = (TResponse)deserializer.Deserialize(respStream);
} }
} }
catch (System.InvalidOperationException) catch (System.InvalidOperationException)
@ -1189,22 +1185,7 @@ namespace OpenSim.Framework
{ {
using (Stream respStream = resp.GetResponseStream()) using (Stream respStream = resp.GetResponseStream())
{ {
XmlSerializer deserializer = new XmlSerializer(typeof(TResponse)); deserial = XMLResponseHelper.LogAndDeserialize<TRequest, TResponse>(respStream, resp.ContentLength);
if (WebUtil.DebugLevel >= 5)
{
byte[] data = new byte[resp.ContentLength];
Util.ReadStream(respStream, data);
WebUtil.LogResponseDetail(System.Text.Encoding.UTF8.GetString(data));
using (MemoryStream temp = new MemoryStream(data))
deserial = (TResponse)deserializer.Deserialize(temp);
}
else
{
deserial = (TResponse)deserializer.Deserialize(respStream);
}
} }
} }
else else
@ -1278,5 +1259,29 @@ namespace OpenSim.Framework
return deserial; return deserial;
} }
public static class XMLResponseHelper
{
public static TResponse LogAndDeserialize<TRequest, TResponse>(Stream respStream, long contentLength)
{
XmlSerializer deserializer = new XmlSerializer(typeof(TResponse));
if (WebUtil.DebugLevel >= 5)
{
byte[] data = new byte[contentLength];
Util.ReadStream(respStream, data);
WebUtil.LogResponseDetail(System.Text.Encoding.UTF8.GetString(data));
using (MemoryStream temp = new MemoryStream(data))
return (TResponse)deserializer.Deserialize(temp);
}
else
{
return (TResponse)deserializer.Deserialize(respStream);
}
}
}
} }
} }