Avoid setting Exception#cause to itself.

rubinius · Jul 19, 2016 · 2026c0a · 2026c0a
1 parent e243e50
commit 2026c0a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/core/zed.rb b/core/zed.rb
@@ -1431,7 +1431,7 @@ def raise(exc=undefined, msg=undefined, ctx=nil, cause: nil)
     if undefined.equal? exc
       exc = $!
       exc = RuntimeError.new("No current exception") unless exc
-      exc.cause = cause unless exc.cause
+      exc.cause = cause unless exc.cause or exc == cause
     else
       if exc.respond_to? :exception
         if undefined.equal? msg
@@ -1446,8 +1446,8 @@ def raise(exc=undefined, msg=undefined, ctx=nil, cause: nil)
         raise ::TypeError, 'exception class/object expected'
       end
 
-      exc.cause = cause unless exc.cause
-      exc.cause = $! unless exc.cause
+      exc.cause = cause unless exc.cause or exc == cause
+      exc.cause = $! unless exc.cause or exc == $!
     end
 
     if ctx.kind_of? Array