ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'avination' into careminster

Browse Source 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
This commit is contained in:
Melanie
2012-06-29 22:11:49 +01:00
parent a1a22a2f10 c87f0ac226
commit 05cf51cbbd
11 changed files with 89 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
View File

@@ -89,8 +89,15 @@ namespace OpenSim.Framework.Servers.HttpServer
continue;
}
Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id, str.ReadToEnd());
DoHTTPGruntWork(m_server, req, responsedata);
try
{
Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id, str.ReadToEnd());
DoHTTPGruntWork(m_server, req, responsedata);
}
catch (ObjectDisposedException) // Browser aborted before we could read body, server closed the stream
{
// Ignore it, no need to reply
}
}
else
{
@@ -161,4 +168,4 @@ namespace OpenSim.Framework.Servers.HttpServer
}
}
}
}
}