caused BigDecimal regression after jruby-1_7 merge - missed a isNaN()…

… check in div ... also return from getVpValueWithPrec19 from an cannotBeCoerced() invocation
jruby · Jun 5, 2015 · 908ecdd · 908ecdd
1 parent 2d3914a
commit 908ecdd
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/ext/bigdecimal/RubyBigDecimal.java b/core/src/main/java/org/jruby/ext/bigdecimal/RubyBigDecimal.java
@@ -440,9 +440,9 @@ private static RubyBigDecimal getVpRubyObjectWithPrec19Inner(ThreadContext conte
 
     private static RubyBigDecimal getVpValueWithPrec19(ThreadContext context, IRubyObject value, long precision, boolean must) {
         if (value instanceof RubyFloat) {
-            if (precision > Long.MAX_VALUE) cannotBeCoerced(context, value, must);
+            if (precision > Long.MAX_VALUE) return cannotBeCoerced(context, value, must);
 
-            return new RubyBigDecimal(context.runtime, BigDecimal.valueOf(((RubyFloat)value).getDoubleValue()));
+            return new RubyBigDecimal(context.runtime, BigDecimal.valueOf(((RubyFloat) value).getDoubleValue()));
         }
         else if (value instanceof RubyRational) {
             if (precision < 0) {
@@ -1009,6 +1009,7 @@ public IRubyObject op_div(ThreadContext context, IRubyObject other, IRubyObject
 
         RubyBigDecimal val = getVpValue(context, other, false);
         if (val == null) return callCoerced(context, "div", other, true);
+        if (isNaN() || (isZero() && val.isZero()) || val.isNaN()) return newNaN(context.runtime);
 
         if (val.isZero()) {
             int sign1 = isInfinity() ? infinitySign : value.signum();