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

InputStream.read() throws SerialPortTimeoutException instead of silently returning same character

This commit is contained in:
hedgecrw85 2019-01-10 11:39:59 -06:00
parent e1fda4d2f2
commit 62fc0f0184
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/fazecast/jSerialComm/SerialPort.java
View File

@ -1236,11 +1236,17 @@ public final class SerialPort
} }
@Override @Override
public final int read() throws SerialPortIOException public final int read() throws SerialPortIOException, SerialPortTimeoutException
{ {
// Perform error checking
if (!isOpened) if (!isOpened)
throw new SerialPortIOException("This port appears to have been shutdown or disconnected."); throw new SerialPortIOException("This port appears to have been shutdown or disconnected.");
return (readBytes(portHandle, byteBuffer, 1L, 0) < 0) ? -1 : ((int)byteBuffer[0] & 0xFF);
// Read from the serial port
int numRead = readBytes(portHandle, byteBuffer, 1L, 0);
if (numRead == 0)
throw new SerialPortTimeoutException("The read operation timed out before any data was returned.");
return (numRead < 0) ? -1 : ((int)byteBuffer[0] & 0xFF);
} }
@Override @Override