aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDr Scofield2009-01-28 18:58:49 +0000
committerDr Scofield2009-01-28 18:58:49 +0000
commit4cfa36ee8bd1fe0068b079bcad47491a1b7fc860 (patch)
tree8f19513453535f035fc015eb3c61f05678217998 /OpenSim
parentFrom: Christopher Yeoh <yeohc@au1.ibm.com> (diff)
downloadopensim-SC_OLD-4cfa36ee8bd1fe0068b079bcad47491a1b7fc860.zip
opensim-SC_OLD-4cfa36ee8bd1fe0068b079bcad47491a1b7fc860.tar.gz
opensim-SC_OLD-4cfa36ee8bd1fe0068b079bcad47491a1b7fc860.tar.bz2
opensim-SC_OLD-4cfa36ee8bd1fe0068b079bcad47491a1b7fc860.tar.xz
fix: client gets logged out when concierge's broker returns 500
response.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Concierge/ConciergeModule.cs15
1 files changed, 11 insertions, 4 deletions
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
412 412
413 private void UpdateBrokerDone(IAsyncResult result) 413 private void UpdateBrokerDone(IAsyncResult result)
414 { 414 {
415 HttpWebRequest updatePost = result.AsyncState as HttpWebRequest; 415 try
416 using (HttpWebResponse response = updatePost.EndGetResponse(result) as HttpWebResponse)
417 { 416 {
418 response.Close(); 417 HttpWebRequest updatePost = result.AsyncState as HttpWebRequest;
419 _log.DebugFormat("[Concierge] broker update: status {0}", response.StatusCode); 418 using (HttpWebResponse response = updatePost.EndGetResponse(result) as HttpWebResponse)
419 {
420 response.Close();
421 _log.DebugFormat("[Concierge] broker update: status {0}", response.StatusCode);
422 }
423 }
424 catch (WebException we)
425 {
426 _log.ErrorFormat("[Concierge] broker update to {0} failed with status {1}", _brokerURI, we.Status);
420 } 427 }
421 } 428 }
422 429