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 window(time) possible interrupts while terminating #6684

Merged
merged 1 commit into from
Oct 29, 2019

Conversation

akarnokd
Copy link
Member

Fix the case in window(time) variants where the timer thread is busy with window emission and the upstream terminates on some other thread, the window emission is interrupted.

The drain loop will take care of disposing the timer and the main downstream can simply be terminated.

Related #6674
Fixes #6672

@codecov
Copy link

codecov bot commented Oct 29, 2019

Codecov Report

Merging #6684 into 2.x will increase coverage by 0.13%.
The diff coverage is 88.88%.

Impacted file tree graph

@@             Coverage Diff              @@
##                2.x    #6684      +/-   ##
============================================
+ Coverage     98.15%   98.29%   +0.13%     
- Complexity     6345     6351       +6     
============================================
  Files           677      677              
  Lines         45550    45526      -24     
  Branches       6333     6333              
============================================
+ Hits          44711    44751      +40     
+ Misses          267      241      -26     
+ Partials        572      534      -38
Impacted Files Coverage Δ Complexity Δ
...al/operators/observable/ObservableWindowTimed.java 91.26% <87.5%> (+0.8%) 4 <0> (ø) ⬇️
...ternal/operators/flowable/FlowableWindowTimed.java 92.32% <90%> (+0.47%) 4 <0> (ø) ⬇️
...rnal/operators/flowable/FlowableFlatMapSingle.java 94.56% <0%> (-1.09%) 2% <0%> (ø)
...tivex/internal/schedulers/TrampolineScheduler.java 96.1% <0%> (-2.6%) 6% <0%> (ø)
.../operators/mixed/FlowableConcatMapCompletable.java 98.29% <0%> (-1.71%) 2% <0%> (ø)
...tivex/internal/operators/single/SingleTimeout.java 100% <0%> (ø) 2% <0%> (ø) ⬇️
...perators/mixed/ObservableConcatMapCompletable.java 100% <0%> (ø) 3% <0%> (ø) ⬇️
...io/reactivex/subscribers/SerializedSubscriber.java 100% <0%> (ø) 27% <0%> (ø) ⬇️
...perators/observable/ObservableMergeWithSingle.java 99.06% <0%> (-0.94%) 2% <0%> (ø)
.../operators/maybe/MaybeFlatMapIterableFlowable.java 98.36% <0%> (ø) 2% <0%> (ø) ⬇️
... and 21 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 90ae2a3...5c21033. Read the comment docs.

@akarnokd akarnokd merged commit bbaea42 into ReactiveX:2.x Oct 29, 2019
@akarnokd akarnokd deleted the WindowTimeInterruptFix2x branch October 29, 2019 08:38
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.

2 participants