always attempt to convert IO.select timeout argument to_f (9K version…

… of #821)
jruby · Jan 8, 2016 · 363cbb4 · 363cbb4
1 parent e4aae85
commit 363cbb4
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/core/src/main/java/org/jruby/RubyIO.java b/core/src/main/java/org/jruby/RubyIO.java
@@ -3314,7 +3314,6 @@ public static RubyIO convertToIO(ThreadContext context, IRubyObject obj) {
     @JRubyMethod(name = "select", required = 1, optional = 3, meta = true)
     public static IRubyObject select(ThreadContext context, IRubyObject recv, IRubyObject[] argv) {
         IRubyObject read, write, except, _timeout;
-        Long timeout;
         read = write = except = _timeout = context.nil;
 
         switch (argv.length) {
@@ -3327,13 +3326,21 @@ public static IRubyObject select(ThreadContext context, IRubyObject recv, IRubyO
             case 1:
                 read = argv[0];
         }
+        final Long timeout;
         if (_timeout.isNil()) {
             timeout = null;
         }
         else {
-            double tmp = _timeout.convertToFloat().getDoubleValue();
-            if (tmp < 0) throw context.runtime.newArgumentError("negative timeout");
-            timeout = (long)(tmp * 1000); // ms
+            try { // MRI calls to_f even if not respond_to? (or respond_to_missing?) :to_f
+                _timeout = _timeout.callMethod(context, "to_f");
+            }
+            catch (RaiseException e) {
+                TypeConverter.handleUncoercibleObject(true, _timeout, context.runtime.getFloat());
+                throw e; // won't happen
+            }
+            final double t = _timeout.convertToFloat().getDoubleValue();
+            if ( t < 0 ) throw context.runtime.newArgumentError("negative timeout");
+            timeout = (long) (t * 1000); // ms
         }
 
         SelectExecutor args = new SelectExecutor(read, write, except, timeout);