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: fa265432e1bd
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 199f7bb82971
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 14, 2015

  1. Issue #2924

    @cdwijayarathna
    cdwijayarathna committed May 14, 2015
    Copy the full SHA
    3862843 View commit details

Commits on May 19, 2015

  1. Merge pull request #2939 from cdwijayarathna/checktype2 

    Issue #2924
    @headius
    headius committed May 19, 2015
    Copy the full SHA
    199f7bb View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 core/src/main/java/org/jruby/util/TypeConverter.java
4 changes: 2 additions & 2 deletions core/src/main/java/org/jruby/util/TypeConverter.java
View file
Original file line number Diff line number Diff line change
@@ -293,11 +293,11 @@ public static void checkType(ThreadContext context, IRubyObject x, RubyModule t)
throw context.runtime.newRuntimeError("bug: undef leaked to the Ruby space");
}

xt = x.getMetaClass().getNativeClassIndex();
xt = x.getMetaClass().getClassIndex();

// MISSING: special error for T_DATA of a certain type
if (xt != t.getClassIndex()) {
String tname = t.getBaseName();
String tname = x.getMetaClass().toString();
if (tname != null) {
throw context.runtime.newTypeError("wrong argument type " + tname + " (expected " + t.getName() + ")");
}