| commit | d5b4537fad3a63d43cc76a87d55721ed81bb6b6b | [log] [tgz] |
|---|---|---|
| author | Wyatt Hepler <hepler@google.com> | Fri Jun 24 18:44:21 2022 +0000 |
| committer | CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> | Fri Jun 24 18:44:21 2022 +0000 |
| tree | cb8ac429b9c58c58da97d65e98dd4c93d164b362 | |
| parent | 84e4983da1c60413752fed699388001e97e034d7 [diff] |
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>
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 47f9f1f..8892d89 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 @@ } 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) {