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

try to work around missing BOM

master
UbitUmarov 2020-05-18 02:37:03 +01:00
parent e308ab8843
commit aca5728ab2
2 changed files with 51 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
View File

@ -30,6 +30,7 @@ using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using System.Text;
using System.Xml; using System.Xml;
using log4net; using log4net;
using OpenMetaverse; using OpenMetaverse;
@ -129,20 +130,17 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
try try
{ {
// Quickly check if this is a coalesced object, without fully parsing the XML // Quickly check if this is a coalesced object, without fully parsing the XML
using (StringReader sr = new StringReader(xml)) using (XmlTextReader reader = new XmlTextReader(new StringReader(xml)))
{ {
using (XmlTextReader reader = new XmlTextReader(sr)) reader.MoveToContent(); // skip possible xml declaration
if (reader.Name != "CoalescedObject")
{ {
reader.MoveToContent(); // skip possible xml declaration // m_log.DebugFormat(
// "[COALESCED SCENE OBJECTS SERIALIZER]: TryFromXml() root element was {0} so returning false",
// reader.Name);
if (reader.Name != "CoalescedObject") return false;
{
// m_log.DebugFormat(
// "[COALESCED SCENE OBJECTS SERIALIZER]: TryFromXml() root element was {0} so returning false",
// reader.Name);
return false;
}
} }
} }
@ -199,49 +197,49 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
if (data[len - 1] == 0) if (data[len - 1] == 0)
--len; --len;
// Quickly check if this is a coalesced object, without fully parsing the XML // Quickly check if this is a coalesced object, without fully parsing the XML
using (MemoryStream ms = new MemoryStream(data, 0, len, false)) MemoryStream ms = new MemoryStream(data, 0, len, false);
StreamReader sr = new StreamReader(ms, Encoding.UTF8);
using (XmlTextReader reader = new XmlTextReader(sr))
{ {
using (XmlTextReader reader = new XmlTextReader(ms)) reader.MoveToContent(); // skip possible xml declaration
if (reader.Name != "CoalescedObject")
{ {
reader.MoveToContent(); // skip possible xml declaration
if (reader.Name != "CoalescedObject")
{
return false;
}
}
ms.Seek(0, SeekOrigin.Begin);
XmlDocument doc = new XmlDocument();
doc.Load(ms);
XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
if (e == null)
return false; return false;
coa = new CoalescedSceneObjects(UUID.Zero);
XmlNodeList groups = e.SelectNodes("SceneObjectGroup");
int i = 0;
foreach (XmlNode n in groups)
{
SceneObjectGroup so = SceneObjectSerializer.FromOriginalXmlFormat(n.OuterXml);
if (so != null)
{
coa.Add(so);
}
else
{
// XXX: Possibly we should fail outright here rather than continuing if a particular component of the
// coalesced object fails to load.
m_log.WarnFormat(
"[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml for component {0} failed. Continuing.",
i);
}
i++;
} }
} }
XmlDocument doc = new XmlDocument();
using (ms = new MemoryStream(data, 0, len, false))
doc.Load(ms);
XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
if (e == null)
return false;
coa = new CoalescedSceneObjects(UUID.Zero);
XmlNodeList groups = e.SelectNodes("SceneObjectGroup");
int i = 0;
foreach (XmlNode n in groups)
{
SceneObjectGroup so = SceneObjectSerializer.FromOriginalXmlFormat(n.OuterXml);
if (so != null)
{
coa.Add(so);
}
else
{
// XXX: Possibly we should fail outright here rather than continuing if a particular component of the
// coalesced object fails to load.
m_log.WarnFormat(
"[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml for component {0} failed. Continuing.",
i);
}
i++;
}
} }
catch (Exception e) catch (Exception e)
{ {

7
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
View File

@ -29,8 +29,8 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.IO; using System.IO;
using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text;
using System.Xml; using System.Xml;
using log4net; using log4net;
using OpenMetaverse; using OpenMetaverse;
@ -86,7 +86,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
return null; return null;
if(data[len -1 ] == 0) if(data[len -1 ] == 0)
--len; --len;
using (MemoryStream ms = new MemoryStream(data,0, len, false))
MemoryStream ms = new MemoryStream(data,0, len, false);
using(StreamReader sr = new StreamReader(ms, Encoding.UTF8))
{ {
using (XmlReader reader = XmlReader.Create(ms, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment })) using (XmlReader reader = XmlReader.Create(ms, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment }))
{ {
@ -97,7 +99,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
catch (Exception e) catch (Exception e)
{ {
m_log.Error("[SERIALIZER]: Deserialization of xml data failed ", e); m_log.Error("[SERIALIZER]: Deserialization of xml data failed ", e);
string s = Utils.BytesToString(data);
return null; return null;
} }
} }