Skip to content

Fix a bug when ticket timeout less than zero #767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 18, 2020
Merged

Fix a bug when ticket timeout less than zero #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d03156b
Merge pull request #1 from zeromq/master
imkcy9 Jun 28, 2019
a3c878c
Merge pull request #2 from zeromq/master
imkcy9 Sep 20, 2019
33fb858
Merge pull request #3 from zeromq/master
imkcy9 Feb 26, 2020
c287964
Fix ticket bug
imkcy9 Feb 26, 2020
9e3c558
Add ticker unit test.
imkcy9 Mar 2, 2020
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
9 changes: 8 additions & 1 deletion src/main/java/org/zeromq/timer/ZTicket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,14 @@ public long timeout()
sortIfNeeded();
// Tickets are sorted, so check first ticket
Ticket first = tickets.get(0);
return first.start - now() + first.delay;
long time = first.start - now() + first.delay;

if (time > 0) {
return time;
}
else {
return 0;
}
}

/**
Expand Down
11 changes: 11 additions & 0 deletions src/test/java/org/zeromq/timer/ZTickerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.junit.Test;
import org.zeromq.timer.ZTicket.Ticket;
import org.zeromq.timer.ZTimer.Timer;
import zmq.ZMQ;

public class ZTickerTest
{
Expand Down Expand Up @@ -68,6 +69,16 @@ public void testTicketInsertion()
assertThat(ticker.timeout(), is(1L));
}

@Test
public void testTicketTimeout()
{
ZTicker ticker = new ZTicker();
Ticket ticket = ticker.addTicket(1, NOOP);
ZMQ.sleep(1);
assertThat(ticket, is(notNullValue()));
assertThat(ticker.timeout(), is(0L));
}

@Test
public void testTimerInsertion()
{
Expand Down