Merge 9e3c558 into 06ea1a4

zeromq · Mar 3, 2020 · b9f649d · b9f649d
2 parents 06ea1a4 + 9e3c558
commit b9f649d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/main/java/org/zeromq/timer/ZTicket.java b/src/main/java/org/zeromq/timer/ZTicket.java
@@ -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;
+        }
     }
 
     /**

diff --git a/src/test/java/org/zeromq/timer/ZTickerTest.java b/src/test/java/org/zeromq/timer/ZTickerTest.java
@@ -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
 {
@@ -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()
     {