From 4cfa36ee8bd1fe0068b079bcad47491a1b7fc860 Mon Sep 17 00:00:00 2001
From: Dr Scofield
Date: Wed, 28 Jan 2009 18:58:49 +0000
Subject: fix: client gets logged out when concierge's broker returns 500
 response.

---
 .../Modules/Avatar/Concierge/ConciergeModule.cs           | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Environment/Modules/Avatar')

diff --git a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
index b4f1a9e..ffc2d36 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs
@@ -412,11 +412,18 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Concierge
 
         private void UpdateBrokerDone(IAsyncResult result)
         {
-            HttpWebRequest updatePost = result.AsyncState as HttpWebRequest;
-            using (HttpWebResponse response = updatePost.EndGetResponse(result) as HttpWebResponse)
+            try 
             {
-                response.Close();
-                _log.DebugFormat("[Concierge] broker update: status {0}", response.StatusCode);
+                HttpWebRequest updatePost = result.AsyncState as HttpWebRequest;
+                using (HttpWebResponse response = updatePost.EndGetResponse(result) as HttpWebResponse)
+                {
+                    response.Close();
+                    _log.DebugFormat("[Concierge] broker update: status {0}", response.StatusCode);
+                }
+            }
+            catch (WebException we)
+            {
+                _log.ErrorFormat("[Concierge] broker update to {0} failed with status {1}", _brokerURI, we.Status);
             }
         }
 
-- 
cgit v1.1