File tree Expand file tree Collapse file tree 2 files changed +10
-42
lines changed
src/main/java/io/reactivex/internal/operators Expand file tree Collapse file tree 2 files changed +10
-42
lines changed Original file line number Diff line number Diff line change @@ -90,7 +90,7 @@ public void onError(Throwable t) {
9090 @ Override
9191 public void onComplete () {
9292 SubscriptionHelper .cancel (other );
93- completeMain ();
93+ completion ();
9494 }
9595
9696 void setOther (Subscription o ) {
@@ -117,7 +117,7 @@ public void error(Throwable e) {
117117
118118 public void complete () {
119119 upstream .cancel ();
120- completeOther ();
120+ completion ();
121121 }
122122
123123 void emit () {
@@ -134,9 +134,7 @@ void emit() {
134134 }
135135 }
136136
137- abstract void completeMain ();
138-
139- abstract void completeOther ();
137+ abstract void completion ();
140138
141139 abstract void run ();
142140 }
@@ -178,12 +176,7 @@ static final class SampleMainNoLast<T> extends SamplePublisherSubscriber<T> {
178176 }
179177
180178 @ Override
181- void completeMain () {
182- downstream .onComplete ();
183- }
184-
185- @ Override
186- void completeOther () {
179+ void completion () {
187180 downstream .onComplete ();
188181 }
189182
@@ -207,16 +200,7 @@ static final class SampleMainEmitLast<T> extends SamplePublisherSubscriber<T> {
207200 }
208201
209202 @ Override
210- void completeMain () {
211- done = true ;
212- if (wip .getAndIncrement () == 0 ) {
213- emit ();
214- downstream .onComplete ();
215- }
216- }
217-
218- @ Override
219- void completeOther () {
203+ void completion () {
220204 done = true ;
221205 if (wip .getAndIncrement () == 0 ) {
222206 emit ();
Original file line number Diff line number Diff line change @@ -84,7 +84,7 @@ public void onError(Throwable t) {
8484 @ Override
8585 public void onComplete () {
8686 DisposableHelper .dispose (other );
87- completeMain ();
87+ completion ();
8888 }
8989
9090 boolean setOther (Disposable o ) {
@@ -109,7 +109,7 @@ public void error(Throwable e) {
109109
110110 public void complete () {
111111 upstream .dispose ();
112- completeOther ();
112+ completion ();
113113 }
114114
115115 void emit () {
@@ -119,9 +119,7 @@ void emit() {
119119 }
120120 }
121121
122- abstract void completeMain ();
123-
124- abstract void completeOther ();
122+ abstract void completion ();
125123
126124 abstract void run ();
127125 }
@@ -163,12 +161,7 @@ static final class SampleMainNoLast<T> extends SampleMainObserver<T> {
163161 }
164162
165163 @ Override
166- void completeMain () {
167- downstream .onComplete ();
168- }
169-
170- @ Override
171- void completeOther () {
164+ void completion () {
172165 downstream .onComplete ();
173166 }
174167
@@ -192,16 +185,7 @@ static final class SampleMainEmitLast<T> extends SampleMainObserver<T> {
192185 }
193186
194187 @ Override
195- void completeMain () {
196- done = true ;
197- if (wip .getAndIncrement () == 0 ) {
198- emit ();
199- downstream .onComplete ();
200- }
201- }
202-
203- @ Override
204- void completeOther () {
188+ void completion () {
205189 done = true ;
206190 if (wip .getAndIncrement () == 0 ) {
207191 emit ();
You can’t perform that action at this time.
0 commit comments