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

* Attempting to fix NullRef exception in inventory.

0.6.5-rc1
Adam Frisby 2009-05-10 21:00:07 +00:00
parent 2d4166fecf
commit dd8c01d7a7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Framework/Communications/Capabilities/LLSDHelpers.cs
View File

@ -66,7 +66,7 @@ namespace OpenSim.Framework.Communications.Capabilities
FieldInfo[] fields = myType.GetFields(); FieldInfo[] fields = myType.GetFields();
for (int i = 0; i < fields.Length; i++) for (int i = 0; i < fields.Length; i++)
{ {
try if (fields[i] != null && fields[i].GetValue(obj) != null)
{ {
object fieldValue = fields[i].GetValue(obj); object fieldValue = fields[i].GetValue(obj);
LLSDType[] fieldAttributes = LLSDType[] fieldAttributes =
@ -91,12 +91,12 @@ namespace OpenSim.Framework.Communications.Capabilities
// OpenMetaverse.StructuredData.LLSDParser.SerializeXmlElement( // OpenMetaverse.StructuredData.LLSDParser.SerializeXmlElement(
// writer, OpenMetaverse.StructuredData.OSD.FromObject(fieldValue)); // writer, OpenMetaverse.StructuredData.OSD.FromObject(fieldValue));
} }
} catch(NullReferenceException e) }
else
{ {
System.Console.WriteLine("-----------NRE-------------"); // TODO from ADAM: There is a nullref being caused by fields[i] being null
System.Console.WriteLine("Type: " + fields[i].GetValue(obj).GetType().FullName); // on some computers. Unsure what is causing this, but would appreciate
System.Console.WriteLine("-----------NRE-------------"); // if sdague could take a look at this.
throw;
} }
} }
writer.WriteEndElement(); writer.WriteEndElement();