aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-04-29 18:22:49 +0000
committerJustin Clarke Casey2009-04-29 18:22:49 +0000
commit517a454086281b31be7ca0f4303ab2eef5b0cd5a (patch)
tree9549cbda06310abff9d0e1ddfc26d05197e18fb5 /OpenSim/Region
parent* Apply http://opensimulator.org/mantis/view.php?id=3554 (diff)
downloadopensim-SC_OLD-517a454086281b31be7ca0f4303ab2eef5b0cd5a.zip
opensim-SC_OLD-517a454086281b31be7ca0f4303ab2eef5b0cd5a.tar.gz
opensim-SC_OLD-517a454086281b31be7ca0f4303ab2eef5b0cd5a.tar.bz2
opensim-SC_OLD-517a454086281b31be7ca0f4303ab2eef5b0cd5a.tar.xz
* Apply http://opensimulator.org/mantis/view.php?id=3557
* Stops XmlRpcGroups crashing client sessions if there is an XMLRPC failure * Thanks mcortez
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupData.cs20
1 files changed, 19 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupData.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupData.cs
index c380232..e913543 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupData.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupData.cs
@@ -760,7 +760,25 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
760 req = new NoKeepAliveXmlRpcRequest(function, parameters); 760 req = new NoKeepAliveXmlRpcRequest(function, parameters);
761 } 761 }
762 762
763 XmlRpcResponse resp = req.Send(m_serviceURL, 10000); 763 XmlRpcResponse resp = null;
764
765 try
766 {
767 req.Send(m_serviceURL, 10000);
768 }
769 catch (Exception e)
770 {
771 m_log.Error("[GROUPS] An error has occured while attempting to access the XmlRpcGroups server");
772 m_log.ErrorFormat("[GROUPS] {0} ", e.ToString());
773
774 foreach (KeyValuePair<object, object> kvp in param)
775 {
776 m_log.WarnFormat("[GROUPS] {0} :: {1}", kvp.Key.ToString(), kvp.Value.ToString());
777 }
778 Hashtable respData = (Hashtable)resp.Value;
779 respData.Add("error", e.ToString());
780 return respData;
781 }
764 782
765 if (resp.Value is Hashtable) 783 if (resp.Value is Hashtable)
766 { 784 {