Merge pull request #6392 from ahorek/date_cmp_fix

headius · web-flow · commit 0673a6564799 · 2020-09-14T11:49:45.000-05:00
restore $! on date comparisons
diff --git a/core/src/main/java/org/jruby/ext/date/RubyDate.java b/core/src/main/java/org/jruby/ext/date/RubyDate.java
@@ -798,9 +798,11 @@ public IRubyObject op_eqq(ThreadContext context, IRubyObject other) {
 
     private IRubyObject fallback_eqq(ThreadContext context, IRubyObject other) {
         RubyArray res;
+        final IRubyObject $ex = context.getErrorInfo();
         try {
             res = (RubyArray) other.callMethod(context, "coerce", this);
         } catch (RaiseException ex) {
+            context.setErrorInfo($ex);
             if (ex.getException() instanceof RubyNoMethodError) return context.nil;
             throw ex;
         }
@@ -854,9 +856,11 @@ private int cmpSubMillis(ThreadContext context, final RubyDate that) {
 
     private IRubyObject fallback_cmp(ThreadContext context, IRubyObject other) {
         RubyArray res;
+        final IRubyObject $ex = context.getErrorInfo();
         try {
             res = (RubyArray) other.callMethod(context, "coerce", this);
         } catch (RaiseException ex) {
+            context.setErrorInfo($ex);
             if (ex.getException() instanceof RubyNoMethodError) return context.nil;
             throw ex;
         }
diff --git a/test/jruby/test_date.rb b/test/jruby/test_date.rb
@@ -938,6 +938,24 @@ def test_bignum_jd_fraction
     #assert_equal(0.4, dt.sec_fraction.to_f.round(1))
   end
 
+  def test_exception_cause_cmp
+    begin
+      Date.new(2000, 1, 1) == nil
+      raise TypeError
+    rescue TypeError => e
+      assert_equal(nil, e.cause)
+    end
+  end
+
+  def test_exception_cause_eqq
+    begin
+      Date.new(2000, 1, 1) <=> nil
+      raise TypeError
+    rescue TypeError => e
+      assert_equal(nil, e.cause)
+    end
+  end
+
   module ActiveSupport
 
     module_function
