From 8c879315c5e031241f5dc20a80ce5542b3f8f004 Mon Sep 17 00:00:00 2001 From: Orr Sella Date: Wed, 23 Apr 2014 15:06:31 +0300 Subject: [PATCH] Don't report ExceededTimeout if timeout is Duration.Zero --- src/main/scala/com/wix/async/FuturePerfect.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/com/wix/async/FuturePerfect.scala b/src/main/scala/com/wix/async/FuturePerfect.scala index 24aeac7..1d98e3e 100644 --- a/src/main/scala/com/wix/async/FuturePerfect.scala +++ b/src/main/scala/com/wix/async/FuturePerfect.scala @@ -46,7 +46,7 @@ trait FuturePerfect extends Reporting[Event] { val elapsedInBlockingCall = Stopwatch.start() val res: T = nested val duration = elapsedInBlockingCall() - if (duration > timeout) { + if (timeout != Duration.Zero && duration > timeout) { report(ExceededTimeout(duration, executionName, res)) }