Skip to content
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.

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

2.x: fix timeout with fallback not cancelling the main source #4945

Merged
merged 1 commit into from
Dec 29, 2016

Conversation

akarnokd
Copy link
Member

This PR fixes the lack of dispose/cancel call towards the upstream in the timed+fallback timeout operator version.

In addition, the selector version received similar unit tests to ensure they work properly (they did).

Related: #4944.

@codecov-io
Copy link

codecov-io commented Dec 29, 2016

Current coverage is 95.57% (diff: 100%)

Merging #4945 into 2.x will decrease coverage by 0.03%

@@                2.x      #4945   diff @@
==========================================
  Files           587        587          
  Lines         37549      37551     +2   
  Methods           0          0          
  Messages          0          0          
  Branches       5655       5655          
==========================================
- Hits          35904      35891    -13   
- Misses          692        702    +10   
- Partials        953        958     +5   

Powered by Codecov. Last update a9f1f4f...983b6b0

@akarnokd akarnokd merged commit 5e3c6bd into ReactiveX:2.x Dec 29, 2016
@akarnokd akarnokd deleted the TimeoutCancelFix branch December 29, 2016 19:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants