Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-22 01:11:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fixes artf3989: Java SerialPort no longer ignores return value of serialRead"

Browse Source
This commit is contained in:
Fred Silberberg (WPI)
2015-01-21 14:58:09 -08:00
committed by Gerrit Code Review
parent 0b414b1bde 102c992e50
commit 130319b771
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpilibj/wpilibJavaDevices/src/main/java/edu/wpi/first/wpilibj/SerialPort.java
View File

@@ -362,9 +362,9 @@ public class SerialPort {
ByteBuffer status = ByteBuffer.allocateDirect(4);
status.order(ByteOrder.LITTLE_ENDIAN);
ByteBuffer dataReceivedBuffer = ByteBuffer.allocateDirect(count);
SerialPortJNI.serialRead(m_port, dataReceivedBuffer, count, status.asIntBuffer());
int gotten = SerialPortJNI.serialRead(m_port, dataReceivedBuffer, count, status.asIntBuffer());
HALUtil.checkStatus(status.asIntBuffer());
byte[] retVal = new byte[count];
byte[] retVal = new byte[gotten];
dataReceivedBuffer.get(retVal);
return retVal;
}