Do not use SelectorPool to create selectors that won't pool.

Fixes #3588.
jruby · Jan 20, 2016 · a9a1184 · a9a1184
1 parent 811a8d1
commit a9a1184
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/core/src/main/java/org/jruby/util/io/SelectExecutor.java b/core/src/main/java/org/jruby/util/io/SelectExecutor.java
@@ -1,5 +1,6 @@
 package org.jruby.util.io;
 
+import jnr.enxio.channels.NativeSelectorProvider;
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyIO;
@@ -321,20 +322,26 @@ private Selector getSelector(ThreadContext context, SelectableChannel channel) t
         }
 
         if (selector == null) {
-            selector = context.runtime.getSelectorPool().get(channel.provider());
-            selectors.add(selector);
+            if (channel.provider() instanceof NativeSelectorProvider) {
+                // We don't pool these, so create it directly
+                selector = channel.provider().openSelector();
 
-            if (!selector.provider().equals(SelectorProvider.provider())) {
                 // need to create pipe between alt impl selector and native NIO selector
                 Pipe pipe = Pipe.open();
                 ENXIOSelector enxioSelector = new ENXIOSelector(selector, pipe);
                 if (enxioSelectors.isEmpty()) enxioSelectors = new ArrayList<ENXIOSelector>();
                 enxioSelectors.add(enxioSelector);
                 pipe.source().configureBlocking(false);
                 pipe.source().register(getSelector(context, pipe.source()), SelectionKey.OP_READ, enxioSelector);
-            } else if (mainSelector == null) {
-                mainSelector = selector;
+            } else {
+                selector = context.runtime.getSelectorPool().get();
+
+                if (mainSelector == null) {
+                    mainSelector = selector;
+                }
             }
+
+            selectors.add(selector);
         }
 
         return selector;