diff options
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs index 35a8dee..1e3fbf0 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs | |||
@@ -25,6 +25,8 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | /* Ubit work moved to PollServiceRequestManager | ||
29 | |||
28 | using System; | 30 | using System; |
29 | using System.Collections; | 31 | using System.Collections; |
30 | using System.Collections.Generic; | 32 | using System.Collections.Generic; |
@@ -89,8 +91,15 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
89 | continue; | 91 | continue; |
90 | } | 92 | } |
91 | 93 | ||
92 | Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id, str.ReadToEnd()); | 94 | try |
93 | DoHTTPGruntWork(m_server, req, responsedata); | 95 | { |
96 | Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id, str.ReadToEnd()); | ||
97 | DoHTTPGruntWork(m_server, req, responsedata); | ||
98 | } | ||
99 | catch (ObjectDisposedException) // Browser aborted before we could read body, server closed the stream | ||
100 | { | ||
101 | // Ignore it, no need to reply | ||
102 | } | ||
94 | } | 103 | } |
95 | else | 104 | else |
96 | { | 105 | { |
@@ -161,4 +170,5 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
161 | } | 170 | } |
162 | } | 171 | } |
163 | } | 172 | } |
164 | } \ No newline at end of file | 173 | } |
174 | */ \ No newline at end of file | ||