Merge pull request #431 from pitr-ch/futures

rescue Exception in Futures

Author: Petr Chalupa

lib/concurrent/edge/future.rb

@@ -132,6 +132,7 @@ def post_on(executor, *args, &job)
     class Event < Synchronization::LockableObject
       safe_initialization!
       include Concern::Deprecation
+      include Concern::Logging
 
       # @!visibility private
       class State
@@ -885,6 +886,7 @@ def hide_completable
     # @!visibility private
     class AbstractPromise < Synchronization::Object
       safe_initialization!
+      include Concern::Logging
 
       def initialize(future)
         super()
@@ -925,7 +927,10 @@ def complete_with(new_state, raise_on_reassign = true)
       # @return [Future]
       def evaluate_to(*args, block)
         complete_with Future::Success.new(block.call(*args))
-      rescue => error
+      rescue StandardError => error
+        complete_with Future::Failed.new(error)
+      rescue Exception => error
+        log(ERROR, 'Edge::Future', error)
         complete_with Future::Failed.new(error)
       end
     end

spec/concurrent/edge/future_spec.rb

@@ -334,6 +334,14 @@
         expect(f.reason).to be_an_instance_of TypeError
       end
     end
+
+    it 'completes future when Exception raised' do
+      f = Concurrent.future { raise Exception, 'fail' }
+      f.wait 1
+      expect(f).to be_completed
+      expect(f).to be_failed
+      expect{ f.value! }.to raise_error(Exception, 'fail')
+    end
   end
 
   describe 'interoperability' do