When cancelling a SelectionKey, remove it from the selected key set. F…

…ixes jruby/jruby#398, and possibly jruby/jruby#334.
jnr · Nov 17, 2012 · 79639b1 · 79639b1
1 parent 1936e05
commit 79639b1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/main/java/jnr/enxio/channels/KQSelector.java b/src/main/java/jnr/enxio/channels/KQSelector.java
@@ -162,6 +162,9 @@ private int poll(long timeout) {
                     KQSelectionKey kqs = (KQSelectionKey) k;
                     Descriptor d = descriptors.get(kqs.getFD());
                     deregister(kqs);
+                    synchronized (selected) {
+                        selected.remove(kqs);
+                    }
                     d.keys.remove(kqs);
                     if (d.keys.isEmpty()) {
                         io.put(changebuf, nchanged++, kqs.getFD(), EVFILT_READ, EV_DELETE);

diff --git a/src/main/java/jnr/enxio/channels/PollSelector.java b/src/main/java/jnr/enxio/channels/PollSelector.java
@@ -179,6 +179,9 @@ private void remove(PollSelectionKey k) {
             }
             keyArray[nfds - 1] = null;
             --nfds;
+            synchronized (selected) {
+                selected.remove(k);
+            }
             keys.remove(k);
         }
         deregister(k);