From 86a9710e77b76fb8a37faf9dacd22a0973628d92 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 24 Jul 2014 23:32:39 +0100 Subject: [PATCH] change previus code, send a NoEvents response back to http server, even if we know there is no one there, so that the server finishes handling it. --- .../Framework/Servers/HttpServer/PollServiceRequestManager.cs | 3 --- .../ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs index 21e52ca434..4058229af3 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs @@ -204,9 +204,6 @@ namespace OpenSim.Framework.Servers.HttpServer { Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id); - if (responsedata == null) - continue; - if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.LongPoll) // This is the event queue { try diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs index e0ce35b155..4a2ac86e0c 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs @@ -380,8 +380,7 @@ namespace OpenSim.Region.ClientStack.Linden Queue queue = GetQueue(pAgentId); if (queue == null) { - //return NoEvents(requestID, pAgentId); - return null; + return NoEvents(requestID, pAgentId); } OSD element;