Skip to content

2.x: fix Observable.concatMapEager bad logic for immediate scalars #4982

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.

Sign up for GitHub

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

Merged
akarnokd merged 2 commits into from
Jan 11, 2017
Merged

2.x: fix Observable.concatMapEager bad logic for immediate scalars #4982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffa85ce
2.x: fix Observable.concatMapEager bad logic for immediate scalars
akarnokd Jan 11, 2017
64cf7cb
Don't print-log
akarnokd Jan 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions src/main/java/io/reactivex/internal/operators/observable/ObservableConcatMapEager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
package io.reactivex.internal.operators.observable;

import java.util.ArrayDeque;
import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicInteger;

import io.reactivex.*;
Expand Down Expand Up @@ -218,7 +217,6 @@ public void innerComplete(InnerQueuedObserver<R> inner) {
drain();
}

@SuppressWarnings("unchecked")
@Override
public void drain() {
if (getAndIncrement() != 0) {
Expand Down Expand Up @@ -276,23 +274,6 @@ public void drain() {
return;
}

if (source instanceof Callable) {
R w;

try {
w = ((Callable<R>)source).call();
} catch (Throwable ex) {
Exceptions.throwIfFatal(ex);
error.addThrowable(ex);
continue;
}

if (w != null) {
a.onNext(w);
}
continue;
}

InnerQueuedObserver<R> inner = new InnerQueuedObserver<R>(this, prefetch);

observers.offer(inner);
Expand Down
18 changes: 18 additions & 0 deletions src/test/java/io/reactivex/internal/operators/flowable/FlowableConcatMapEagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1175,4 +1175,22 @@ public void innerLong() {
.assertComplete()
.assertNoErrors();
}

@Test
public void oneDelayed() {
Flowable.just(1, 2, 3, 4, 5)
.concatMapEager(new Function<Integer, Flowable<Integer>>() {
@Override
public Flowable<Integer> apply(Integer i) throws Exception {
return i == 3 ? Flowable.just(i) : Flowable
.just(i)
.delay(1, TimeUnit.MILLISECONDS, Schedulers.io());
}
})
.observeOn(Schedulers.io())
.test()
.awaitDone(5, TimeUnit.SECONDS)
.assertResult(1, 2, 3, 4, 5)
;
}
}
18 changes: 18 additions & 0 deletions src/test/java/io/reactivex/internal/operators/observable/ObservableConcatMapEagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,4 +983,22 @@ public ObservableSource<Object> apply(Object v) throws Exception {
}
});
}

@Test
public void oneDelayed() {
Observable.just(1, 2, 3, 4, 5)
.concatMapEager(new Function<Integer, ObservableSource<Integer>>() {
@Override
public ObservableSource<Integer> apply(Integer i) throws Exception {
return i == 3 ? Observable.just(i) : Observable
.just(i)
.delay(1, TimeUnit.MILLISECONDS, Schedulers.io());
}
})
.observeOn(Schedulers.io())
.test()
.awaitDone(5, TimeUnit.SECONDS)
.assertResult(1, 2, 3, 4, 5)
;
}
}