unbreak coercion logic where every array from a valid coerce would wa…

…rn. recent regression
jruby · Aug 18, 2015 · 9b5e691 · 9b5e691
1 parent 60ca99d
commit 9b5e691
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/core/src/main/java/org/jruby/RubyNumeric.java b/core/src/main/java/org/jruby/RubyNumeric.java
@@ -483,15 +483,17 @@ protected final RubyArray doCoerce(ThreadContext context, IRubyObject other, boo
     }
 
     private static RubyArray coerceResult(final Ruby runtime, final IRubyObject result, final boolean err) {
-        if ( ! (result instanceof RubyArray) || ((RubyArray) result).getLength() != 2 ) {
-            if ( err ) throw runtime.newTypeError("coerce must return [x, y]");
+        if (!(result instanceof RubyArray) || ((RubyArray) result).getLength() != 2 ) {
+            if (err) throw runtime.newTypeError("coerce must return [x, y]");
+
+            if (!result.isNil()) {
+                RubyWarnings warnings = runtime.getWarnings();
+                warnings.warn("Bad return value for #coerce, called by numerical comparison operators.");
+                warnings.warn("#coerce must return [x, y]. The next release will raise an error for this.");
+            }
             return null;
         }
-        else if ( ! result.isNil() ) {
-            RubyWarnings warnings = runtime.getWarnings();
-            warnings.warn("Bad return value for #coerce, called by numerical comparison operators.");
-            warnings.warn("#coerce must return [x, y]. The next release will raise an error for this.");
-        }
+
         return (RubyArray) result;
     }