aboutsummaryrefslogtreecommitdiff
path: root/pw_transfer/java/main/dev/pigweed
diff options
context:
space:
mode:
authorWyatt Hepler <hepler@google.com>2022-06-24 18:44:21 +0000
committerCQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-06-24 18:44:21 +0000
commitd5b4537fad3a63d43cc76a87d55721ed81bb6b6b (patch)
treecb8ac429b9c58c58da97d65e98dd4c93d164b362 /pw_transfer/java/main/dev/pigweed
parent84e4983da1c60413752fed699388001e97e034d7 (diff)
downloadpigweed-d5b4537fad3a63d43cc76a87d55721ed81bb6b6b.tar.gz
pw_transfer: Prevent zero length sleeps on the transfer thread
The transfer thread was ignoring the next timeout and always setting sleepFor to 0. Fixes: b/236881052 Change-Id: Ic08fd9195f4cb7a315bb791220c99d7c677496cb Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/99680 Reviewed-by: Alexei Frolov <frolv@google.com> Pigweed-Auto-Submit: Wyatt Hepler <hepler@google.com> Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
Diffstat (limited to 'pw_transfer/java/main/dev/pigweed')
-rw-r--r--pw_transfer/java/main/dev/pigweed/pw_transfer/TransferEventHandler.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/pw_transfer/java/main/dev/pigweed/pw_transfer/TransferEventHandler.java b/pw_transfer/java/main/dev/pigweed/pw_transfer/TransferEventHandler.java
index 47f9f1fcf..8892d89b4 100644
--- a/pw_transfer/java/main/dev/pigweed/pw_transfer/TransferEventHandler.java
+++ b/pw_transfer/java/main/dev/pigweed/pw_transfer/TransferEventHandler.java
@@ -179,7 +179,7 @@ class TransferEventHandler {
}
private void handleNextEvent() {
- final long sleepFor = Math.min(0, Instant.now().until(getNextTimeout(), TIME_UNIT));
+ final long sleepFor = TIME_UNIT.between(Instant.now(), getNextTimeout());
try {
Event event = events.poll(sleepFor, POLL_TIME_UNIT);
if (event != null) {