File tree 2 files changed +10
-42
lines changed
src/main/java/io/reactivex/internal/operators
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) {
90
90
@ Override
91
91
public void onComplete () {
92
92
SubscriptionHelper .cancel (other );
93
- completeMain ();
93
+ completion ();
94
94
}
95
95
96
96
void setOther (Subscription o ) {
@@ -117,7 +117,7 @@ public void error(Throwable e) {
117
117
118
118
public void complete () {
119
119
upstream .cancel ();
120
- completeOther ();
120
+ completion ();
121
121
}
122
122
123
123
void emit () {
@@ -134,9 +134,7 @@ void emit() {
134
134
}
135
135
}
136
136
137
- abstract void completeMain ();
138
-
139
- abstract void completeOther ();
137
+ abstract void completion ();
140
138
141
139
abstract void run ();
142
140
}
@@ -178,12 +176,7 @@ static final class SampleMainNoLast<T> extends SamplePublisherSubscriber<T> {
178
176
}
179
177
180
178
@ Override
181
- void completeMain () {
182
- downstream .onComplete ();
183
- }
184
-
185
- @ Override
186
- void completeOther () {
179
+ void completion () {
187
180
downstream .onComplete ();
188
181
}
189
182
@@ -207,16 +200,7 @@ static final class SampleMainEmitLast<T> extends SamplePublisherSubscriber<T> {
207
200
}
208
201
209
202
@ 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 () {
220
204
done = true ;
221
205
if (wip .getAndIncrement () == 0 ) {
222
206
emit ();
Original file line number Diff line number Diff line change @@ -84,7 +84,7 @@ public void onError(Throwable t) {
84
84
@ Override
85
85
public void onComplete () {
86
86
DisposableHelper .dispose (other );
87
- completeMain ();
87
+ completion ();
88
88
}
89
89
90
90
boolean setOther (Disposable o ) {
@@ -109,7 +109,7 @@ public void error(Throwable e) {
109
109
110
110
public void complete () {
111
111
upstream .dispose ();
112
- completeOther ();
112
+ completion ();
113
113
}
114
114
115
115
void emit () {
@@ -119,9 +119,7 @@ void emit() {
119
119
}
120
120
}
121
121
122
- abstract void completeMain ();
123
-
124
- abstract void completeOther ();
122
+ abstract void completion ();
125
123
126
124
abstract void run ();
127
125
}
@@ -163,12 +161,7 @@ static final class SampleMainNoLast<T> extends SampleMainObserver<T> {
163
161
}
164
162
165
163
@ Override
166
- void completeMain () {
167
- downstream .onComplete ();
168
- }
169
-
170
- @ Override
171
- void completeOther () {
164
+ void completion () {
172
165
downstream .onComplete ();
173
166
}
174
167
@@ -192,16 +185,7 @@ static final class SampleMainEmitLast<T> extends SampleMainObserver<T> {
192
185
}
193
186
194
187
@ 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 () {
205
189
done = true ;
206
190
if (wip .getAndIncrement () == 0 ) {
207
191
emit ();
You can’t perform that action at this time.
0 commit comments