Skip to content

Fix deadlock of Future when the handler raises Exception #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jdantonio merged 2 commits into from
Apr 19, 2015
Merged

Fix deadlock of Future when the handler raises Exception #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56209f8
Fix deadlock of Future when the handler raises Exception
amutake Apr 10, 2015
f1a66d8
Add a test case for Future
amutake Apr 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/concurrent/future.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def self.execute(opts = {}, &block)

# @!visibility private
def work # :nodoc:
success, val, reason = SafeTaskExecutor.new(@task).execute(*@args)
success, val, reason = SafeTaskExecutor.new(@task, rescue_exception: true).execute(*@args)
complete(success, val, reason)
end
end
Expand Down
10 changes: 10 additions & 0 deletions spec/concurrent/future_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,16 @@ def trigger_observable(observable)
expect(future.value).to be_nil
end

it 'sets the value to nil when the handler raises Exception' do
future = Future.new(executor: executor){ raise Exception }.execute
expect(future.value).to be_nil
Copy link
Member

@pitr-ch pitr-ch Apr 10, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you also test that future.reason is set to the Exception instance?

Copy link
Contributor Author

@amutake amutake Apr 10, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for quick response!

I added a test case. Could you check it?

end

it 'sets the reason to the Exception instance when the handler raises Exception' do
future = Future.new(executor: executor){ raise Exception }.execute
expect(future.reason).to be_a(Exception)
end

it 'sets the state to :rejected when the handler raises an exception' do
future = Future.new(executor: executor){ raise StandardError }.execute
expect(future).to be_rejected
Expand Down