rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2015-05-16 00:04:52 -04:00
parent d1856c1406
commit d7c99c5199
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java_console/autotest/src/com/rusefi/TestingUtils.java
View File

@ -105,6 +105,8 @@ public class TestingUtils {
}
static EngineChart nextChart() {
getNextWaveChart();
getNextWaveChart();
return EngineChartParser.unpackToMap(getNextWaveChart());
}

9
java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java
View File

@ -165,9 +165,9 @@ public class BinaryProtocol {
long start = System.currentTimeMillis();
while (true) {
dropPending();
try {
dropPending();
stream.write("~\n".getBytes());
synchronized (cbb) {
boolean isTimeout = waitForBytes(2, start, "switch to binary");
@ -194,7 +194,7 @@ public class BinaryProtocol {
}
}
private void dropPending() {
private void dropPending() throws IOException {
synchronized (cbb) {
if (isClosed)
return;
@ -337,8 +337,9 @@ public class BinaryProtocol {
public byte[] exchange(byte[] packet, String msg, boolean allowLongResponse) {
if (isClosed)
return null;
dropPending();
try {
dropPending();
sendCrcPacket(packet);
return receivePacket(msg, allowLongResponse);
} catch (InterruptedException e) {