2.x: fix Single.takeUntil() other triggering twice #4962

Merged
merged 1 commit into from Jan 6, 2017

Projects

None yet

3 participants

@akarnokd
Member
akarnokd commented Jan 6, 2017

This PR fixes the double termination of Single.takeUntil(Publisher) when the other fires an item and then completes while ignoring the cancellation in between, trying to signal a CancellationException again which is routed to the RxJavaPlugins.onError and crashing on Android.

In addition, the Maybe.takeUntil() received a unit test verifying this doesn't also happen to it.

Related: #4961.

@akarnokd akarnokd added 2.x Bug labels Jan 6, 2017
@akarnokd akarnokd added this to the 2.0 backlog milestone Jan 6, 2017
@codecov-io
codecov-io commented Jan 6, 2017 edited

Current coverage is 95.60% (diff: 100%)

Merging #4962 into 2.x will decrease coverage by <.01%

@@                2.x      #4962   diff @@
==========================================
  Files           587        587          
  Lines         37669      37671     +2   
  Methods           0          0          
  Messages          0          0          
  Branches       5675       5676     +1   
==========================================
  Hits          36016      36016          
- Misses          693        704    +11   
+ Partials        960        951     -9   

Powered by Codecov. Last update 71330c0...7818169

@akarnokd akarnokd merged commit b917754 into ReactiveX:2.x Jan 6, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@akarnokd akarnokd deleted the akarnokd:TakeUntilFix branch Jan 6, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment