Merge pull request #209 from jessedusty/master

Fix #154 - relay dies with AssertionError
Genymobile · Sep 7, 2019 · 7ce96ab · 7ce96ab
2 parents cfc63a2 + c814bfb
commit 7ce96ab
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) {