protect edge future against ConcurrencyError form JRuby

thomas07vt · Jul 29, 2016 · d8c81c5 · d8c81c5
1 parent db7c21f
commit d8c81c5
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/concurrent/edge/future.rb b/lib/concurrent/edge/future.rb
@@ -399,10 +399,14 @@ def wait_until_complete(timeout)
 
         @Lock.synchronize do
           @Waiters.increment
-          unless completed?
-            @Condition.wait @Lock, timeout
+          begin
+            unless completed?
+              @Condition.wait @Lock, timeout
+            end
+          ensure
+            # JRuby may raise ConcurrencyError
+            @Waiters.decrement
           end
-          @Waiters.decrement
         end
         completed?
       end