RUBY-328: Future.get can inadvertently ignore timeout in some cases

avalanche123 · stamhankar999 · commit c1d4fb0478f6 · 2018-10-15T12:38:09.000-07:00
diff --git a/lib/cassandra/future.rb b/lib/cassandra/future.rb
@@ -615,9 +615,9 @@ def get(timeout = nil)
               @waiting += 1
               while @state == :pending
                 if deadline
+                  break if now >= deadline
                   @cond.wait(deadline - now)
                   now = ::Time.now
-                  break if now >= deadline
                 else
                   @cond.wait
                 end
