Fix cleanup race condition

Fix race condition in Java due to timeout from no activity, misses the cleaning deadline by a small number of milliseconds. Fixes <Genymobile#154> Evidence: Selected keys size 1 now: 1562790544556 nextCleaningDeadline 1562790662669 Selected keys size 0 now: 1562790662667 nextCleaningDeadline 1562790662669 selector.select() returned without any event, an invalid SelectionKey was probably been registered Selected keys size 0 now: 1562790662670 nextCleaningDeadline 1562790662669 Selected keys size 0 now: 1562790722672 nextCleaningDeadline 1562790722670 2019-07-10 16:32:02.673 I UDPConnection: UDP 10.0.0.2:31650 -> 208.67.222.222:53 Close Signed-off-by: Romain Vimont <[email protected]>
matt-johnston-ecommistry · Sep 7, 2019 · c814bfb · c814bfb
1 parent cfc63a2
commit c814bfb
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/relay-java/src/main/java/com/genymobile/gnirehtet/relay/Relay.java b/relay-java/src/main/java/com/genymobile/gnirehtet/relay/Relay.java
@@ -53,11 +53,9 @@ public void run() throws IOException {
             Set<SelectionKey> selectedKeys = selector.selectedKeys();
 
             long now = System.currentTimeMillis();
-            if (now >= nextCleaningDeadline) {
+            if (now >= nextCleaningDeadline || selectedKeys.isEmpty()) {
                 tunnelServer.cleanUp();
                 nextCleaningDeadline = now + CLEANING_INTERVAL;
-            } else if (selectedKeys.isEmpty()) {
-                throw new AssertionError("selector.select() returned without any event, an invalid SelectionKey was probably been registered");
             }
 
             for (SelectionKey selectedKey : selectedKeys) {