proxy progress

one more go? it makes no sense :(
This commit is contained in:
rusefi 2020-07-08 20:32:20 -04:00
parent 6e76a9c4a9
commit 4e56edc93e
1 changed files with 6 additions and 15 deletions

View File

@ -188,7 +188,11 @@ public class LinkManager {
int portPart = TcpConnector.getTcpPort(port);
String hostname = TcpConnector.getHostname(port);
socket = new Socket(hostname, portPart);
return new TcpIoStream(logger, socket);
TcpIoStream tcpIoStream = new TcpIoStream(logger, socket);
IncomingDataBuffer dataBuffer = IncomingDataBuffer.createDataBuffer(tcpIoStream, logger);
tcpIoStream.setDataBuffer(dataBuffer);
return tcpIoStream;
} catch (Throwable e) {
stateListener.onConnectionFailed();
return null;
@ -196,20 +200,7 @@ public class LinkManager {
}
};
Callable<IoStream> ioStreamCallable = new Callable<IoStream>() {
@Override
public IoStream call() {
IoStream stream = streamFactory.call();
if (stream == null) {
// error already reported
return null;
}
IncomingDataBuffer dataBuffer = IncomingDataBuffer.createDataBuffer(stream, logger);
stream.setDataBuffer(dataBuffer);
return stream;
}
};
setConnector(new StreamConnector(this, port, logger, ioStreamCallable));
setConnector(new StreamConnector(this, port, logger, streamFactory));
isSimulationMode = true;
} else {
Callable<IoStream> ioStreamCallable = () -> SerialIoStreamJSerialComm.openPort(port, logger);