From e9f29f3702d5ed2ed2760a45963cac2a1ee0dc57 Mon Sep 17 00:00:00 2001 From: Brian Schroeder Date: Wed, 4 Feb 2015 19:37:55 -0500 Subject: [PATCH] Support nil interval in arity-2 timeout! --- src/manifold/deferred.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/manifold/deferred.clj b/src/manifold/deferred.clj index 6bfc9f99..570c3b04 100644 --- a/src/manifold/deferred.clj +++ b/src/manifold/deferred.clj @@ -925,7 +925,7 @@ returned by `chain`, all actions not yet completed will be short-circuited upon timeout." ([d interval] (cond - (realized? d) + (or (nil? interval) (realized? d)) nil (not (pos? interval))