ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

catch exceptions when loading malformed xml files

Browse Source
This commit is contained in:
Jeff Ames
2007-11-17 05:53:12 +00:00
parent c5ddbd3254
commit 946db5461c
3 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Framework/ConfigurationMember.cs
View File

@@ -166,8 +166,16 @@ namespace OpenSim.Framework
if (configurationFilename.Trim() != "")
{
configurationPlugin.SetFileName(configurationFilename);
configurationPlugin.LoadData();
useFile = true;
try
{
configurationPlugin.LoadData();
useFile = true;
}
catch (XmlException e)
{
MainLog.Instance.Error("Error loading " + configurationFilename + ": " + e.ToString());
useFile = false;
}
}
else
{
@@ -189,7 +197,6 @@ namespace OpenSim.Framework
bool ignoreNextFromConfig = false;
while (convertSuccess == false)
{
string console_result = "";
string attribute = null;
if (useFile || (!useFile && configurationFromXMLNode != null))
@@ -228,7 +235,6 @@ namespace OpenSim.Framework
//Dont Ask! Just use default
console_result = configOption.configurationDefault;
}
}
}
else
@@ -292,7 +298,6 @@ namespace OpenSim.Framework
{
convertSuccess = true;
return_result = intResult;
}
errorMessage = "a signed 32 bit integer (int)";
break;
@@ -347,7 +352,6 @@ namespace OpenSim.Framework
{
convertSuccess = true;
return_result = uintResult;
}
errorMessage = "an unsigned 32 bit integer (uint)";
break;
@@ -387,7 +391,6 @@ namespace OpenSim.Framework
configurationPlugin.SetAttribute(configOption.configurationKey, console_result);
}
if (!this.resultFunction(configOption.configurationKey, return_result))
{
Console.MainLog.Instance.Notice("The handler for the last configuration option denied that input, please try again.");