jruby · Nov 13, 2014 · Nov 13, 2014
Showing with 14 additions and 4 deletions.

+14 −4 core/src/main/java/org/jruby/ext/bigdecimal/RubyBigDecimal.java

0 ...sion/{GH-1633_bigdecimal_operations_with_nil.rb → GH-1633_bigdecimal_operations_with_nil_spec.rb}
diff --git a/core/src/main/java/org/jruby/ext/bigdecimal/RubyBigDecimal.java b/core/src/main/java/org/jruby/ext/bigdecimal/RubyBigDecimal.java
@@ -406,11 +406,21 @@ private static boolean isOverflowExceptionMode(Ruby runtime) {
     }
 
     private static RubyBigDecimal cannotBeCoerced(ThreadContext context, IRubyObject v, boolean must) {
-        if (!must) return null;
+        if (must) {
+            String err;
 
-        String err = v.isImmediate() ? RubyObject.inspect(context, v).toString() : v.getMetaClass().getBaseName();
-
-        throw context.runtime.newArgumentError(err + " can't be coerced into BigDecimal");
+            if (v == null) {
+                err = "nil";
+            } else if (v.isImmediate()) {
+                err = RubyObject.inspect(context, v).toString();
+            } else {
+                err = v.getMetaClass().getBaseName();
+            }
+
+            throw context.runtime.newTypeError(err + " can't be coerced into BigDecimal");
+        }
+
+        return null;
     }
 
     private static RubyBigDecimal unableToCoerceWithoutPrec(ThreadContext context, IRubyObject v, boolean must) {

diff --git a/...GH-1633_bigdecimal_operations_with_nil.rb → ...33_bigdecimal_operations_with_nil_spec.rb b/...GH-1633_bigdecimal_operations_with_nil.rb → ...33_bigdecimal_operations_with_nil_spec.rb