caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

ruffy: catch race-condition sending keep alive during disconnect.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-10-30 00:43:54 +01:00
parent 03443f3358
commit cccf6f175c
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ruffyscripter/src/main/java/org/monkey/d/ruffy/ruffy/driver/Ruffy.java
View file

@ -277,6 +277,7 @@ public class Ruffy extends Service {
} }
while(rtModeRunning) while(rtModeRunning)
{ {
try {
if (System.currentTimeMillis() > lastRtMessageSent + 1000L) { if (System.currentTimeMillis() > lastRtMessageSent + 1000L) {
log("sending keep alive"); log("sending keep alive");
synchronized (rtSequenceSemaphore) { synchronized (rtSequenceSemaphore) {
@ -284,6 +285,13 @@ public class Ruffy extends Service {
lastRtMessageSent = System.currentTimeMillis(); lastRtMessageSent = System.currentTimeMillis();
} }
} }
} catch (Exception e) {
if (rtModeRunning) {
fail("Error sending keep alive while rtModeRunning is still true");
} else {
fail("Error sending keep alive. rtModeRunning is false, so this is most likely a race condition during disconnect");
}
}
try{ try{
Thread.sleep(500);}catch(Exception e){/*ignore*/} Thread.sleep(500);}catch(Exception e){/*ignore*/}
} }