Merge branch 'master' into httptests

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
 
             XmlDocument doc = new XmlDocument();
 
-            doc.LoadXml(data);
-
-            XmlNodeList rootL = doc.GetElementsByTagName("ServerResponse");
-
-            if (rootL.Count != 1)
-                return ret;
+            try
+            {
+                doc.LoadXml(data);
+                XmlNodeList rootL = doc.GetElementsByTagName("ServerResponse");
 
-            XmlNode rootNode = rootL[0];
+                if (rootL.Count != 1)
+                    return ret;
 
-            ret = ParseElement(rootNode);
+                XmlNode rootNode = rootL[0];
 
+                ret = ParseElement(rootNode);
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[serverUtils.ParseXmlResponse]: failed error: {0} \n --- string: {1} - ",e.Message, data);
+            }
             return ret;
         }