From 75b360f2ff65b0daf222c159ceb10bb7c081643b Mon Sep 17 00:00:00 2001 From: Colin Surprenant Date: Mon, 13 Nov 2017 14:18:51 -0500 Subject: [PATCH] replace decreasing timeout with fixed timeout --- .../src/main/java/org/logstash/common/LsQueueUtils.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/logstash-core/src/main/java/org/logstash/common/LsQueueUtils.java b/logstash-core/src/main/java/org/logstash/common/LsQueueUtils.java index 5188ddc19..36ddef0a3 100644 --- a/logstash-core/src/main/java/org/logstash/common/LsQueueUtils.java +++ b/logstash-core/src/main/java/org/logstash/common/LsQueueUtils.java @@ -77,13 +77,12 @@ public final class LsQueueUtils { private static int drain(final BlockingQueue queue, final Collection collection, final int count, final long nanos) throws InterruptedException { - final long deadline = System.nanoTime() + nanos; int added = 0; do { added += queue.drainTo(collection, count - added); if (added < count) { final JrubyEventExtLibrary.RubyEvent event = - queue.poll(deadline - System.nanoTime(), TimeUnit.NANOSECONDS); + queue.poll(nanos, TimeUnit.NANOSECONDS); if (event == null) { break; }