From 75e2a2b3ceeb67d3124bc8b4534b6927d288fd57 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Wed, 25 Aug 2010 23:34:39 +0200
Subject: Prevent an object disposed exception that made forms comms
 unreliable. After starting an asynchronous write, one should not close the
 channel it will be written to synchrnously, that leads to grief.

---
 .../Servers/HttpServer/SynchronousRestFormsRequester.cs          | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs')

diff --git a/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs b/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs
index acf725a..b2c1c54 100644
--- a/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs
+++ b/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs
@@ -85,8 +85,13 @@ namespace OpenSim.Framework.Servers.HttpServer
                 }
                 finally
                 {
-                    if (requestStream != null)
-                        requestStream.Close();
+                    // If this is closed, it will be disposed internally,
+                    // but the above write is asynchronous and may hit after
+                    // we're through here. So the thread handling that will
+                    // throw and put us back into the catch above. Isn't 
+                    // .NET great?
+                    //if (requestStream != null)
+                    //    requestStream.Close();
                     // Let's not close this
                     //buffer.Close();
 
-- 
cgit v1.1