Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/ZeroMQ/Poller.cs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public int Poll(TimeSpan timeout)
{
return (int)timeout.TotalMilliseconds == Timeout.Infinite
? PollBlocking()
: PollNonBlocking(timeout);
: (int)timeout.TotalMilliseconds == 0 ? PollNonBlocking() : PollNonBlocking(timeout);
}

/// <summary>
Expand Down Expand Up @@ -212,6 +212,21 @@ private int PollNonBlocking(TimeSpan timeout)
return readyCount;
}

private int PollNonBlocking()
{
CreatePollItems();

var readyCount = Poll(0);
if (readyCount >= 0 || ErrorProxy.ContextWasTerminated)
{
return readyCount;
}

ContinueIfInterrupted();

return readyCount;
}

private void CreatePollItems()
{
if (_pollItems == null || _pollItems.Length != _pollableSockets.Count)
Expand Down