aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Base
diff options
context:
space:
mode:
authorUbitUmarov2017-05-26 21:26:51 +0100
committerUbitUmarov2017-05-26 21:26:51 +0100
commite7c2674dec2c9ea36313b51e7bc604753e16f24f (patch)
treef0576a4e48f6ebaed2c8b90f0c0b6b8f9dcd42d9 /OpenSim/Server/Base
parentmantis 8181: don't try to delete contents of a non exitent folder (diff)
downloadopensim-SC-e7c2674dec2c9ea36313b51e7bc604753e16f24f.zip
opensim-SC-e7c2674dec2c9ea36313b51e7bc604753e16f24f.tar.gz
opensim-SC-e7c2674dec2c9ea36313b51e7bc604753e16f24f.tar.bz2
opensim-SC-e7c2674dec2c9ea36313b51e7bc604753e16f24f.tar.xz
cleanup (grid)region info endpoint; add log to try to find some xml decode issues
Diffstat (limited to 'OpenSim/Server/Base')
-rw-r--r--OpenSim/Server/Base/ServerUtils.cs21
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