From 98382540c7b501be03008d063fdbcd9bcd086f2d Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 25 Jul 2020 12:55:13 -0400 Subject: [PATCH] avoiding exception on port auto-detector cancellation --- .../java/com/rusefi/binaryprotocol/IncomingDataBuffer.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java b/java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java index 74efdc8c83..cd722680ff 100644 --- a/java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java +++ b/java_console/io/src/main/java/com/rusefi/binaryprotocol/IncomingDataBuffer.java @@ -106,6 +106,9 @@ public class IncomingDataBuffer { return waitForBytes(Timeouts.BINARY_IO_TIMEOUT, loggingMessage, startTimestamp, count); } + /** + * @return true in case of timeout, false if we have received count of bytes + */ public boolean waitForBytes(int timeoutMs, String loggingMessage, long startTimestamp, int count) { log.info(loggingMessage + ": waiting for " + count + " byte(s)"); synchronized (cbb) { @@ -118,7 +121,7 @@ public class IncomingDataBuffer { try { cbb.wait(timeout); } catch (InterruptedException e) { - throw new IllegalStateException(e); + return true; // thread thrown away, handling like a timeout } } }