jruby · Aug 7, 2017 · Aug 7, 2017 · Aug 7, 2017 · Aug 7, 2017
Showing with 17 additions and 2 deletions.

+5 −0 core/src/main/java/org/jruby/RubyBignum.java

+3 −0 core/src/main/java/org/jruby/RubyFileStat.java

+7 −2 core/src/main/java/org/jruby/RubyThread.java

+2 −0 core/src/main/java/org/jruby/ext/stringio/StringIO.java
diff --git a/core/src/main/java/org/jruby/RubyBignum.java b/core/src/main/java/org/jruby/RubyBignum.java
@@ -1114,6 +1114,11 @@ protected boolean int_round_zero_p(ThreadContext context, int ndigits) {
         return (-0.415241 * ndigits - 0.125 > bytes);
     }
 
+    @Override
+    public boolean isImmediate() {
+        return true;
+    }
+
     @Deprecated
     public final IRubyObject op_pow(final ThreadContext context, final long other) {
         if (other >= 0) {

diff --git a/core/src/main/java/org/jruby/RubyFileStat.java b/core/src/main/java/org/jruby/RubyFileStat.java
@@ -344,6 +344,9 @@ public IRubyObject inspect() {
             buf.append("atime=").append(atime()).append(", ");
             buf.append("mtime=").append(mtime()).append(", ");
             buf.append("ctime=").append(ctime());
+            if (Platform.IS_BSD || Platform.IS_MAC) {
+                buf.append(", ").append("birthtime=").append(birthtime());
+            }
         }
         buf.append('>');
 

diff --git a/core/src/main/java/org/jruby/RubyThread.java b/core/src/main/java/org/jruby/RubyThread.java
@@ -917,7 +917,7 @@ public final Map<Object, IRubyObject> getContextVariables() {
     }
 
     public boolean isAlive(){
-        return threadImpl.isAlive() && status.get() != Status.ABORTING;
+        return threadImpl.isAlive() && status.get() != Status.DEAD;
     }
 
     @JRubyMethod(name = "[]", required = 1)
@@ -1156,15 +1156,17 @@ public static IRubyObject stop(ThreadContext context, IRubyObject receiver) {
 
         synchronized (rubyThread) {
             rubyThread.pollThreadEvents(context);
+            Status oldStatus = rubyThread.status.get();
             try {
                 // attempt to decriticalize all if we're the critical thread
                 receiver.getRuntime().getThreadService().setCritical(false);
 
                 rubyThread.status.set(Status.SLEEP);
                 rubyThread.wait();
             } catch (InterruptedException ie) {
+            } finally {
                 rubyThread.pollThreadEvents(context);
-                rubyThread.status.set(Status.RUN);
+                rubyThread.status.set(oldStatus);
             }
         }
 
@@ -1521,6 +1523,9 @@ public IRubyObject kill() {
         if (currentThread == runtime.getThreadService().getMainThread()) {
             // rb_exit to hard exit process...not quite right for us
         }
+
+        status.set(Status.ABORTING);
+
         return genericKill(runtime, currentThread);
     }
 

diff --git a/core/src/main/java/org/jruby/ext/stringio/StringIO.java b/core/src/main/java/org/jruby/ext/stringio/StringIO.java
@@ -1065,6 +1065,8 @@ public IRubyObject ungetc(ThreadContext context, IRubyObject arg) {
         Encoding enc, enc2;
 
         checkModifiable();
+        checkReadable();
+
         if (arg.isNil()) return arg;
         if (arg instanceof RubyInteger) {
             int len, cc = ((RubyInteger) arg).getIntValue();