probably a minor change
This commit is contained in:
parent
12f0a85e96
commit
d7f67bf990
|
@ -327,13 +327,12 @@ public class BinaryProtocol implements BinaryProtocolCommands {
|
||||||
if (isClosed)
|
if (isClosed)
|
||||||
return null;
|
return null;
|
||||||
try {
|
try {
|
||||||
|
LinkManager.assertCommunicationThread();
|
||||||
dropPending();
|
dropPending();
|
||||||
|
|
||||||
sendPacket(packet);
|
sendPacket(packet);
|
||||||
return receivePacket(msg, allowLongResponse);
|
return receivePacket(msg, allowLongResponse);
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException | IOException e) {
|
||||||
throw new IllegalStateException(e);
|
|
||||||
} catch (IOException e) {
|
|
||||||
logger.error(msg + ": executeCommand failed: " + e);
|
logger.error(msg + ": executeCommand failed: " + e);
|
||||||
close();
|
close();
|
||||||
return null;
|
return null;
|
||||||
|
@ -457,7 +456,7 @@ public class BinaryProtocol implements BinaryProtocolCommands {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String requestPendingMessages() {
|
private String requestPendingMessages() {
|
||||||
if (isClosed)
|
if (isClosed)
|
||||||
return null;
|
return null;
|
||||||
try {
|
try {
|
||||||
|
@ -467,7 +466,8 @@ public class BinaryProtocol implements BinaryProtocolCommands {
|
||||||
// System.out.println(result);
|
// System.out.println(result);
|
||||||
return new String(response, 1, response.length - 1);
|
return new String(response, 1, response.length - 1);
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
throw new IllegalStateException(e);
|
FileLog.MAIN.log(e);
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
|
||||||
* @see EngineSnifferPanel
|
* @see EngineSnifferPanel
|
||||||
*/
|
*/
|
||||||
public class Launcher {
|
public class Launcher {
|
||||||
public static final int CONSOLE_VERSION = 20180124;
|
public static final int CONSOLE_VERSION = 20180125;
|
||||||
public static final boolean SHOW_STIMULATOR = false;
|
public static final boolean SHOW_STIMULATOR = false;
|
||||||
private static final String TAB_INDEX = "main_tab";
|
private static final String TAB_INDEX = "main_tab";
|
||||||
protected static final String PORT_KEY = "port";
|
protected static final String PORT_KEY = "port";
|
||||||
|
|
Loading…
Reference in New Issue