jruby · Feb 19, 2016 · Feb 19, 2016 · Feb 19, 2016 · Feb 19, 2016 · Feb 19, 2016
diff --git a/core/src/main/java/org/jruby/RubyHash.java b/core/src/main/java/org/jruby/RubyHash.java
@@ -233,15 +233,15 @@ public static final RubyHash newHash(Ruby runtime, Map valueMap, IRubyObject def
 
     private RubyHash(Ruby runtime, RubyClass klass, RubyHash other) {
         super(runtime, klass);
-        this.ifNone = runtime.getNil();
+        this.ifNone = UNDEF;
         threshold = INITIAL_THRESHOLD;
         table = other.internalCopyTable(head);
         size = other.size;
     }
 
     public RubyHash(Ruby runtime, RubyClass klass) {
         super(runtime, klass);
-        this.ifNone = runtime.getNil();
+        this.ifNone = UNDEF;
         allocFirst();
     }
 
@@ -702,15 +702,15 @@ public IRubyObject default_value_get(ThreadContext context) {
         if ((flags & PROCDEFAULT_HASH_F) != 0) {
             return context.nil;
         }
-        return ifNone;
+        return ifNone == UNDEF ? context.nil : ifNone;
     }
 
     @JRubyMethod(name = "default")
     public IRubyObject default_value_get(ThreadContext context, IRubyObject arg) {
         if ((flags & PROCDEFAULT_HASH_F) != 0) {
             return Helpers.invoke(context, ifNone, "call", this, arg);
         }
-        return ifNone;
+        return ifNone == UNDEF ? context.nil : ifNone;
     }
 
     /** rb_hash_set_default
@@ -1679,7 +1679,7 @@ public IRubyObject shift(ThreadContext context) {
         if ((flags & PROCDEFAULT_HASH_F) != 0) {
             return this.callMethod(context, "default", context.nil);
         }
-        return ifNone;
+        return ifNone == UNDEF ? context.nil : ifNone;
     }
 
     public final boolean fastDelete(IRubyObject key) {
@@ -2116,7 +2116,7 @@ public void visit(IRubyObject key, IRubyObject value) {
             throw (IOException)e.getCause();
         }
 
-        if (!hash.ifNone.isNil()) output.dumpObject(hash.ifNone);
+        if (hash.ifNone != UNDEF) output.dumpObject(hash.ifNone);
     }
 
     public static RubyHash unmarshalFrom(UnmarshalStream input, boolean defaultValue) throws IOException {

diff --git a/core/src/main/java/org/jruby/RubySignal.java b/core/src/main/java/org/jruby/RubySignal.java
@@ -143,7 +143,7 @@ public static IRubyObject signame(ThreadContext context, final IRubyObject recv,
     public static String signo2signm(long no) {
         for (Signal s : Signal.values()) {
             if (s.intValue() == no) {
-                return s.name();
+                return s.name().substring(3);
             }
         }
         return null;

diff --git a/core/src/main/java/org/jruby/RubyThread.java b/core/src/main/java/org/jruby/RubyThread.java
@@ -1121,6 +1121,10 @@ public RubyArray keys() {
     public static IRubyObject stop(ThreadContext context, IRubyObject receiver) {
         RubyThread rubyThread = context.getThread();
 
+        if (context.runtime.getThreadService().getActiveRubyThreads().length == 1) {
+            throw context.runtime.newThreadError("stopping only thread\n\tnote: use sleep to stop forever");
+        }
+
         synchronized (rubyThread) {
             rubyThread.pollThreadEvents(context);
             try {

diff --git a/core/src/main/java/org/jruby/runtime/marshal/MarshalStream.java b/core/src/main/java/org/jruby/runtime/marshal/MarshalStream.java
@@ -43,6 +43,7 @@
 import org.jcodings.specific.UTF8Encoding;
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
+import org.jruby.RubyBasicObject;
 import org.jruby.RubyBignum;
 import org.jruby.RubyBoolean;
 import org.jruby.RubyClass;
@@ -268,9 +269,9 @@ private void writeObjectData(IRubyObject value) throws IOException {
             case HASH: {
                 RubyHash hash = (RubyHash)value;
 
-                if(hash.getIfNone().isNil()){
+                if(hash.getIfNone() == RubyBasicObject.UNDEF){
                     write('{');
-                }else if (hash.hasDefaultProc()) {
+                } else if (hash.hasDefaultProc()) {
                     throw hash.getRuntime().newTypeError("can't dump hash with default proc");
                 } else {
                     write('}');

diff --git a/core/src/main/java/org/jruby/util/Sprintf.java b/core/src/main/java/org/jruby/util/Sprintf.java
@@ -39,6 +39,7 @@
 import org.jcodings.specific.UTF8Encoding;
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
+import org.jruby.RubyBasicObject;
 import org.jruby.RubyBignum;
 import org.jruby.RubyFixnum;
 import org.jruby.RubyFloat;
@@ -132,7 +133,7 @@ private static final class Args {
         // temporary hack to handle non-Ruby values
         // will come up with better solution shortly
         Args(Ruby runtime, long value) {
-            this(RubyFixnum.newFixnum(runtime,value));
+            this(RubyFixnum.newFixnum(runtime, value));
         }
 
         void raiseArgumentError(String message) {
@@ -160,9 +161,15 @@ IRubyObject next(ByteList name) {
                 IRubyObject object = rubyHash.fastARef(nameSym);
 
                 // if not found, try dispatching to pick up default hash value
-                if (object == null) object = rubyHash.callMethod(runtime.getCurrentContext(), "[]", nameSym);
-
-                if (object.isNil()) raiseKeyError("key<" + name + "> not found");
+                // MRI: spliced together bits from rb_hash_default_value
+                if (object == null) {
+                    object = rubyHash.getIfNone();
+                    if (object == RubyBasicObject.UNDEF) {
+                        raiseKeyError("key<" + name + "> not found");
+                    } else if (rubyHash.hasDefaultProc()) {
+                        object = object.callMethod(runtime.getCurrentContext(), "call", nameSym);
+                    }
+                }
                 return object;
             } else if (rubyHash != null) {
                 raiseArgumentError("positional args mixed with named args");

diff --git a/core/src/main/java/org/jruby/util/SunSignalFacade.java b/core/src/main/java/org/jruby/util/SunSignalFacade.java
@@ -28,6 +28,7 @@
 package org.jruby.util;
 
 import org.jruby.Ruby;
+import org.jruby.RubyFixnum;
 import org.jruby.RubyModule;
 import org.jruby.RubyProc;
 
@@ -84,10 +85,11 @@ public void handle(Signal signal) {
             ThreadContext context = runtime.getCurrentContext();
             IRubyObject oldExc = runtime.getGlobalVariables().get("$!"); // Save $!
             try {
+                RubyFixnum signum = runtime.newFixnum(signal.getNumber());
                 if (block != null) {
-                    block.callMethod(context, "call");
+                    block.callMethod(context, "call", signum);
                 } else {
-                    blockCallback.call(context, new IRubyObject[0], Block.NULL_BLOCK);
+                    blockCallback.call(context, new IRubyObject[] {signum}, Block.NULL_BLOCK);
                 }
             } catch(RaiseException e) {
                 try {

diff --git a/test/mri/excludes/TestRequire.rb b/test/mri/excludes/TestRequire.rb
@@ -1,6 +1,9 @@
 exclude :test_define_class, "an MRI inconsistency - NameError when class BasicSocket already defined!"
 exclude :test_frozen_loaded_features, "error message does not match"
+exclude :test_load_ospath, "we lose encoding on the way into load, can't preserve for LoadError message"
 exclude :test_load2, "needs investigation"
+exclude :test_loading_fifo_threading_raise, "we do not use IO to read files and so will not show as stopped while loading"
+exclude :test_loading_fifo_threading_success, "we do not use IO to read files and so will not show as stopped while loading"
 exclude :test_race_exception, "needs investigation"
 exclude :test_require_changed_home, "needs investigation"
 exclude :test_require_nonascii, "needs investigation"