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

Set up a StreamReader and call ReadToEnd() instead of using the GetStreamString() extension method 

This eliminates some stream seeking that was never necessary and makes disposable of the StreamReader consistent with other code
0.8.0.3
Justin Clark-Casey (justincc) 2014-02-27 23:13:26 +00:00
parent 94ad69faf2
commit 88b1fc1382
1 changed files with 13 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
OpenSim/Framework/WebUtil.cs
View File

@ -265,10 +265,12 @@ namespace OpenSim.Framework
{ {
using (Stream responseStream = response.GetResponseStream()) using (Stream responseStream = response.GetResponseStream())
{ {
string responseStr = null; using (StreamReader reader = new StreamReader(responseStream))
responseStr = responseStream.GetStreamString(); {
// m_log.DebugFormat("[WEB UTIL]: <{0}> response is <{1}>",reqnum,responseStr); string responseStr = reader.ReadToEnd();
return CanonicalizeResults(responseStr); // m_log.DebugFormat("[WEB UTIL]: <{0}> response is <{1}>",reqnum,responseStr);
return CanonicalizeResults(responseStr);
}
} }
} }
} }
@ -426,12 +428,14 @@ namespace OpenSim.Framework
{ {
using (Stream responseStream = response.GetResponseStream()) using (Stream responseStream = response.GetResponseStream())
{ {
string responseStr = null; using (StreamReader reader = new StreamReader(responseStream))
{
string responseStr = reader.ReadToEnd();
OSD responseOSD = OSDParser.Deserialize(responseStr);
responseStr = responseStream.GetStreamString(); if (responseOSD.Type == OSDType.Map)
OSD responseOSD = OSDParser.Deserialize(responseStr); return (OSDMap)responseOSD;
if (responseOSD.Type == OSDType.Map) }
return (OSDMap)responseOSD;
} }
} }
} }
@ -645,38 +649,6 @@ namespace OpenSim.Framework
return totalCopiedBytes; return totalCopiedBytes;
} }
/// <summary>
/// Converts an entire stream to a string, regardless of current stream
/// position
/// </summary>
/// <param name="stream">The stream to convert to a string</param>
/// <returns></returns>
/// <remarks>When this method is done, the stream position will be
/// reset to its previous position before this method was called</remarks>
public static string GetStreamString(this Stream stream)
{
string value = null;
if (stream != null && stream.CanRead)
{
long rewindPos = -1;
if (stream.CanSeek)
{
rewindPos = stream.Position;
stream.Seek(0, SeekOrigin.Begin);
}
StreamReader reader = new StreamReader(stream);
value = reader.ReadToEnd();
if (rewindPos >= 0)
stream.Seek(rewindPos, SeekOrigin.Begin);
}
return value;
}
#endregion Stream #endregion Stream
public class QBasedComparer : IComparer public class QBasedComparer : IComparer