Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8f1a94d89e5c
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 546017662a55
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 6, 2014

  1. fixed issue 2050: add null check

    @k77ch7
    k77ch7 committed Nov 6, 2014
    Copy the full SHA
    bb84902 View commit details

  2. Merge pull request #2123 from k77ch7/GH-2050 

    Fix for issue 2050 : BigDecimal and nil multiplication
    @enebo
    enebo committed Nov 6, 2014
    Copy the full SHA
    5460176 View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 core/src/main/java/org/jruby/ext/bigdecimal/RubyBigDecimal.java
4 changes: 3 additions & 1 deletion core/src/main/java/org/jruby/ext/bigdecimal/RubyBigDecimal.java
View file
Original file line number Diff line number Diff line change
@@ -425,7 +425,9 @@ private static RubyBigDecimal cannotBeCoerced(ThreadContext context, IRubyObject
if (must) {
String err;

if (v.isImmediate()) {
if (v == null) {
err = "nil";
} else if (v.isImmediate()) {
err = RubyObject.inspect(context, v).toString();
} else {
err = v.getMetaClass().getBaseName();