From cdf78aee1eae96d2e5703a9516db0dccc9b39fbd Mon Sep 17 00:00:00 2001 From: rusefi Date: Fri, 21 Aug 2020 14:53:33 -0400 Subject: [PATCH] fixing build - adjusting some strange code to smaller blocking factor --- .../java/com/rusefi/binaryprotocol/BinaryProtocol.java | 8 +------- .../com/rusefi/binaryprotocol/IncomingDataBuffer.java | 2 +- .../main/java/com/rusefi/io/commands/HelloCommand.java | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java b/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java index bead76bb7f..16eff53cb0 100644 --- a/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java +++ b/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java @@ -322,7 +322,7 @@ public class BinaryProtocol implements BinaryProtocolCommands { setController(newVersion); } - private byte[] receivePacket(String msg, boolean allowLongResponse) throws EOFException { + private byte[] receivePacket(String msg, boolean allowLongResponse) throws IOException { long start = System.currentTimeMillis(); synchronized (ioLock) { return incomingData.getPacket(msg, allowLongResponse, start); @@ -465,12 +465,6 @@ public class BinaryProtocol implements BinaryProtocolCommands { } public void writeData(byte[] content, Integer offset, int size) { - if (size > Fields.BLOCKING_FACTOR) { - writeData(content, offset, Fields.BLOCKING_FACTOR); - writeData(content, offset + Fields.BLOCKING_FACTOR, size - Fields.BLOCKING_FACTOR); - return; - } - isBurnPending = true; byte packet[] = new byte[5 + size]; 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 4712cacd5b..3630e21ffd 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 @@ -69,7 +69,7 @@ public class IncomingDataBuffer { if (packetSize < 0) return null; if (!allowLongResponse && packetSize > Math.max(Fields.BLOCKING_FACTOR, Fields.TS_OUTPUT_SIZE) + 10) - return null; + throw new IllegalArgumentException(packetSize + " packet while not allowLongResponse"); isTimeout = waitForBytes(loggingPrefix + msg + " body", start, packetSize + 4); if (isTimeout) diff --git a/java_console/io/src/main/java/com/rusefi/io/commands/HelloCommand.java b/java_console/io/src/main/java/com/rusefi/io/commands/HelloCommand.java index d09b3dd90d..e1eb87f527 100644 --- a/java_console/io/src/main/java/com/rusefi/io/commands/HelloCommand.java +++ b/java_console/io/src/main/java/com/rusefi/io/commands/HelloCommand.java @@ -25,7 +25,7 @@ public class HelloCommand implements Command { @Nullable public static String getHelloResponse(IncomingDataBuffer incomingData) throws EOFException { - byte[] response = incomingData.getPacket("[hello]"); + byte[] response = incomingData.getPacket("[hello]", true); if (!checkResponseCode(response, BinaryProtocolCommands.RESPONSE_OK)) return null; return new String(response, 1, response.length - 1);