Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor

1 files changed, 14 insertions, 5 deletions

diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 36c6c75..c12d666 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -1523,11 +1523,20 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
             else
             {
-
-                //m_log.Info("[BASE HTTP SERVER]: Doing HTTP Grunt work with response");
-                responsecode = (int)responsedata["int_response_code"];
-                responseString = (string)responsedata["str_response_string"];
-                contentType = (string)responsedata["content_type"];
+                try
+                {
+                    //m_log.Info("[BASE HTTP SERVER]: Doing HTTP Grunt work with response");
+                    responsecode = (int)responsedata["int_response_code"];
+                    responseString = (string)responsedata["str_response_string"];
+                    contentType = (string)responsedata["content_type"];
+                }
+                catch
+                {
+                    responsecode = 500;
+                    responseString = "No response could be obtained";
+                    contentType = "text/plain";
+                    responsedata = new Hashtable();
+                }
             }
 
             if (responsedata.ContainsKey("error_status_text"))