Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #52 from Ktlo/rpc-dev-concrurrent-fix

Browse Source 
Concurrency bug in RPCDeviceBusAdapter.java fix
This commit is contained in:
Sangar
2021-08-02 00:00:42 +02:00
committed by GitHub
parent df0c1c776a 6e483501d4
commit 7e6d0f100c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/li/cil/oc2/common/bus/RPCDeviceBusAdapter.java
View File

@@ -390,7 +390,7 @@ public final class RPCDeviceBusAdapter implements Steppable {
if (receiveBuffer != null) throw new IllegalStateException();
final String json = gson.toJson(new Message(type, data));
final byte[] bytes = json.getBytes();
receiveBuffer = ByteBuffer.allocate(bytes.length + MESSAGE_DELIMITER.length * 2);
final ByteBuffer receiveBuffer = ByteBuffer.allocate(bytes.length + MESSAGE_DELIMITER.length * 2);
// In case we went through a reset and the VM was in the middle of reading
// a message we inject a delimiter up front to cause the truncated message
@@ -405,6 +405,7 @@ public final class RPCDeviceBusAdapter implements Steppable {
receiveBuffer.put(MESSAGE_DELIMITER);
receiveBuffer.flip();
this.receiveBuffer = receiveBuffer;
}
///////////////////////////////////////////////////////////////////