call SelectionKey#isValid before readyOps, to prevent CancelledKeyExc…

…eption
socketry · Nov 14, 2017 · 38e8600 · 38e8600
1 parent 75f19d3
commit 38e8600
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/ext/nio4r/org/nio4r/Monitor.java b/ext/nio4r/org/nio4r/Monitor.java
@@ -102,12 +102,16 @@ public IRubyObject removeInterest(ThreadContext context, IRubyObject interest) {
 
     @JRubyMethod
     public IRubyObject readiness(ThreadContext context) {
+        if(!key.isValid())
+          return this.interests; 
         return Nio4r.interestOpsToSymbol(context.getRuntime(), key.readyOps());
     }
 
     @JRubyMethod(name = "readable?")
     public IRubyObject isReadable(ThreadContext context) {
         Ruby runtime  = context.getRuntime();
+        if (!this.key.isValid())
+          return runtime.getTrue();
         int  readyOps = this.key.readyOps();
 
         if((readyOps & SelectionKey.OP_READ) != 0 || (readyOps & SelectionKey.OP_ACCEPT) != 0) {
@@ -120,6 +124,8 @@ public IRubyObject isReadable(ThreadContext context) {
     @JRubyMethod(name = {"writable?", "writeable?"})
     public IRubyObject writable(ThreadContext context) {
         Ruby runtime  = context.getRuntime();
+        if (!this.key.isValid())
+          return runtime.getTrue();
         int  readyOps = this.key.readyOps();
 
         if((readyOps & SelectionKey.OP_WRITE) != 0 || (readyOps & SelectionKey.OP_CONNECT) != 0) {

diff --git a/ext/nio4r/org/nio4r/Selector.java b/ext/nio4r/org/nio4r/Selector.java
@@ -271,7 +271,7 @@ private void cancelKeys() {
     // Remove connect interest from connected sockets
     // See: http://stackoverflow.com/questions/204186/java-nio-select-returns-without-selected-keys-why
     private void processKey(SelectionKey key) {
-        if((key.readyOps() & SelectionKey.OP_CONNECT) != 0) {
+        if(key.isValid() && (key.readyOps() & SelectionKey.OP_CONNECT) != 0) {
             int interestOps = key.interestOps();
 
             interestOps &= ~SelectionKey.OP_CONNECT;