diff options
author | UbitUmarov | 2017-05-27 05:47:05 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-27 05:47:05 +0100 |
commit | c54985f8a16a00032a3647112555b5c82b43efde (patch) | |
tree | 862483e0e10e4862e99b5437340e326df3f3f072 /OpenSim/Server/Base | |
parent | Merge branch 'master' into httptests (diff) | |
parent | minor cleanup (diff) | |
download | opensim-SC-c54985f8a16a00032a3647112555b5c82b43efde.zip opensim-SC-c54985f8a16a00032a3647112555b5c82b43efde.tar.gz opensim-SC-c54985f8a16a00032a3647112555b5c82b43efde.tar.bz2 opensim-SC-c54985f8a16a00032a3647112555b5c82b43efde.tar.xz |
Merge branch 'master' into httptests
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Base/ServerUtils.cs | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs index b17d7ba..aff6b4f 100644 --- a/OpenSim/Server/Base/ServerUtils.cs +++ b/OpenSim/Server/Base/ServerUtils.cs | |||
@@ -478,17 +478,22 @@ namespace OpenSim.Server.Base | |||
478 | 478 | ||
479 | XmlDocument doc = new XmlDocument(); | 479 | XmlDocument doc = new XmlDocument(); |
480 | 480 | ||
481 | doc.LoadXml(data); | 481 | try |
482 | 482 | { | |
483 | XmlNodeList rootL = doc.GetElementsByTagName("ServerResponse"); | 483 | doc.LoadXml(data); |
484 | 484 | XmlNodeList rootL = doc.GetElementsByTagName("ServerResponse"); | |
485 | if (rootL.Count != 1) | ||
486 | return ret; | ||
487 | 485 | ||
488 | XmlNode rootNode = rootL[0]; | 486 | if (rootL.Count != 1) |
487 | return ret; | ||
489 | 488 | ||
490 | ret = ParseElement(rootNode); | 489 | XmlNode rootNode = rootL[0]; |
491 | 490 | ||
491 | ret = ParseElement(rootNode); | ||
492 | } | ||
493 | catch (Exception e) | ||
494 | { | ||
495 | m_log.DebugFormat("[serverUtils.ParseXmlResponse]: failed error: {0} \n --- string: {1} - ",e.Message, data); | ||
496 | } | ||
492 | return ret; | 497 | return ret; |
493 | } | 498 | } |
494 | 499 | ||