FlightSim-Streaming/XPlaneConnectCSP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed timeout bug in setCONN and strengthened test for setCONN.

Browse Source
This commit is contained in:
Jason Watkins
2015-04-03 13:59:26 -07:00
parent cfe34f81ea
commit 74cb81b5f7
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Java/src/XPlaneConnect.java
View File

@@ -579,11 +579,13 @@ public class XPlaneConnect implements AutoCloseable
ByteArrayOutputStream os = new ByteArrayOutputStream(); ByteArrayOutputStream os = new ByteArrayOutputStream();
os.write("CONN".getBytes(StandardCharsets.UTF_8)); os.write("CONN".getBytes(StandardCharsets.UTF_8));
os.write(0xFF); //Placeholder for message length os.write(0xFF); //Placeholder for message length
os.write((byte)recvPort); os.write((byte) recvPort);
os.write((byte)(recvPort >> 8)); os.write((byte) (recvPort >> 8));
sendUDP(os.toByteArray()); sendUDP(os.toByteArray());
int soTimeout = socket.getSoTimeout();
socket.close(); socket.close();
socket = new DatagramSocket(recvPort); socket = new DatagramSocket(recvPort);
socket.setSoTimeout(soTimeout);
} }
} }

2
Java/src/test/XPlaneConnectTest.java
View File

@@ -467,6 +467,8 @@ public class XPlaneConnectTest
xpc.setCONN(p); xpc.setCONN(p);
assertEquals(p, xpc.getRecvPort()); assertEquals(p, xpc.getRecvPort());
result = xpc.requestDREF(dref);
assertEquals(1, result.length);
} }
} }