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

Fixed parsing of coalesced objects if the XML starts with an XML Declaration ("<xml ...>") 

Resolves http://opensimulator.org/mantis/view.php?id=6944
0.8.0.3
Oren Hurvitz 2013-11-18 13:14:49 +02:00
parent 1a32b35279
commit 1769e93c42
1 changed files with 47 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,21 +119,22 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
return output; return output;
} }
} }
public static bool TryFromXml(string xml, out CoalescedSceneObjects coa) public static bool TryFromXml(string xml, out CoalescedSceneObjects coa)
{ {
// m_log.DebugFormat("[COALESCED SCENE OBJECTS SERIALIZER]: TryFromXml() deserializing {0}", xml); // m_log.DebugFormat("[COALESCED SCENE OBJECTS SERIALIZER]: TryFromXml() deserializing {0}", xml);
coa = null; coa = null;
int i = 0;
using (StringReader sr = new StringReader(xml)) try
{ {
using (XmlTextReader reader = new XmlTextReader(sr)) // Quickly check if this is a coalesced object, without fully parsing the XML
{ using (StringReader sr = new StringReader(xml))
try {
using (XmlTextReader reader = new XmlTextReader(sr))
{ {
reader.Read(); reader.MoveToContent(); // skip possible xml declaration
if (reader.Name != "CoalescedObject") if (reader.Name != "CoalescedObject")
{ {
// m_log.DebugFormat( // m_log.DebugFormat(
@ -142,49 +143,49 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
return false; return false;
} }
coa = new CoalescedSceneObjects(UUID.Zero);
reader.Read();
while (reader.NodeType != XmlNodeType.EndElement && reader.Name != "CoalescedObject")
{
if (reader.Name == "SceneObjectGroup")
{
string soXml = reader.ReadOuterXml();
SceneObjectGroup so = SceneObjectSerializer.FromOriginalXmlFormat(soXml);
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++;
}
}
reader.ReadEndElement(); // CoalescedObject
} }
catch (Exception e) }
{
m_log.ErrorFormat( XmlDocument doc = new XmlDocument();
"[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed with {0} {1}", doc.LoadXml(xml);
e.Message, e.StackTrace); 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++;
} }
} }
catch (Exception e)
{
m_log.Error(string.Format(
"[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed with {0} ",
e.Message), e);
return false;
}
return true; return true;
} }
} }
} }