Skip to content

Conversation

@akarnokd
Copy link
Member

@akarnokd akarnokd commented Mar 4, 2018

This PR fixes the upstream handling in Flowable.window(Publisher) and Flowable.window(Callable<Publisher>) operators to make sure if both the main output and the inner windows have been cancelled, the upstream is also cancelled.

Related: #5887, #5881.

In addition, the Jacoco code coverage has been updated to 0.8.0 mainly due to the automatic filtering of difficult-to-impossible code paths.

@akarnokd akarnokd added this to the 2.2 milestone Mar 4, 2018
@codecov
Copy link

codecov bot commented Mar 4, 2018

Codecov Report

Merging #5888 into 2.x will increase coverage by 0.06%.
The diff coverage is 98.65%.

Impacted file tree graph

@@             Coverage Diff              @@
##                2.x    #5888      +/-   ##
============================================
+ Coverage     97.49%   97.55%   +0.06%     
+ Complexity     5946     5941       -5     
============================================
  Files           655      655              
  Lines         43900    43862      -38     
  Branches       6108     6100       -8     
============================================
- Hits          42799    42789      -10     
+ Misses          339      328      -11     
+ Partials        762      745      -17
Impacted Files Coverage Δ Complexity Δ
...ators/flowable/FlowableWindowBoundarySupplier.java 98.74% <98.33%> (+7.23%) 2 <1> (ø) ⬇️
...nal/operators/flowable/FlowableWindowBoundary.java 99.28% <99.02%> (+7.55%) 2 <1> (ø) ⬇️
...nternal/operators/observable/ObservableCreate.java 93.91% <0%> (-5.24%) 2% <0%> (ø)
...in/java/io/reactivex/subjects/BehaviorSubject.java 95.74% <0%> (-2.67%) 54% <0%> (ø)
...ava/io/reactivex/processors/BehaviorProcessor.java 96.86% <0%> (-2.25%) 60% <0%> (ø)
...perators/mixed/ObservableConcatMapCompletable.java 98.23% <0%> (-1.77%) 2% <0%> (ø)
...perators/single/SingleFlatMapIterableFlowable.java 96.66% <0%> (-1.67%) 2% <0%> (ø)
...vex/internal/operators/flowable/FlowableCache.java 92.61% <0%> (-1.35%) 7% <0%> (ø)
...ex/internal/operators/flowable/FlowableCreate.java 96.1% <0%> (-1.32%) 6% <0%> (ø)
...perators/mixed/ObservableSwitchMapCompletable.java 98.93% <0%> (-1.07%) 2% <0%> (ø)
... and 42 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 855153e...1b8de2d. Read the comment docs.

@akarnokd akarnokd merged commit 9f2c435 into ReactiveX:2.x Mar 4, 2018
@akarnokd akarnokd deleted the FlowableWindowFixUpstreamCancel branch March 4, 2018 23:54
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