Skip to content

2.x: fix Completable.concat to use replace (don't dispose old) #5695

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
merged 2 commits into from
Oct 31, 2017
Merged

2.x: fix Completable.concat to use replace (don't dispose old) #5695

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
525e581
2.x: fix Completable.concat to use replace (don't dispose old)
akarnokd Oct 31, 2017
9209efd
Remove comments from original issue report
akarnokd Oct 31, 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
2 changes: 1 addition & 1 deletion src/main/java/io/reactivex/internal/operators/completable/CompletableConcatArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static final class ConcatInnerObserver extends AtomicInteger implements Completa

@Override
public void onSubscribe(Disposable d) {
sd.update(d);
sd.replace(d);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/reactivex/internal/operators/completable/CompletableConcatIterable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ static final class ConcatInnerObserver extends AtomicInteger implements Completa

@Override
public void onSubscribe(Disposable d) {
sd.update(d);
sd.replace(d);
}

@Override
Expand Down
41 changes: 41 additions & 0 deletions src/test/java/io/reactivex/internal/operators/completable/CompletableAndThenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,13 @@

import io.reactivex.Completable;
import io.reactivex.Maybe;
import io.reactivex.functions.Action;
import io.reactivex.schedulers.Schedulers;

import java.util.concurrent.CountDownLatch;

import org.junit.Test;
import static org.junit.Assert.*;

public class CompletableAndThenTest {
@Test(expected = NullPointerException.class)
Expand Down Expand Up @@ -63,4 +69,39 @@ public void andThenMaybeError() {
.assertError(RuntimeException.class)
.assertErrorMessage("bla");
}

@Test
public void andThenNoInterrupt() throws InterruptedException {
for (int k = 0; k < 100; k++) {
final int count = 10;
final CountDownLatch latch = new CountDownLatch(count);
final boolean[] interrupted = { false };
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: AtomicBoolean would be a nicer replacement for mutable Boolean :)


for (int i = 0; i < count; i++) {
Completable.complete()
.subscribeOn(Schedulers.io())
.observeOn(Schedulers.io())
.andThen(Completable.fromAction(new Action() {
@Override
public void run() throws Exception {
try {
Thread.sleep(30);
} catch (InterruptedException e) {
System.out.println("Interrupted! " + Thread.currentThread());
interrupted[0] = true;
}
}
}))
.subscribe(new Action() {
@Override
public void run() throws Exception {
latch.countDown();
}
});
}

latch.await();
assertFalse("The second Completable was interrupted!", interrupted[0]);
}
}
}
40 changes: 39 additions & 1 deletion src/test/java/io/reactivex/internal/operators/completable/CompletableConcatTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@
import static org.junit.Assert.*;

import java.util.*;
import java.util.concurrent.CountDownLatch;

import org.junit.Test;
import org.reactivestreams.*;

import io.reactivex.*;
import io.reactivex.disposables.Disposables;
import io.reactivex.exceptions.*;
import io.reactivex.functions.Function;
import io.reactivex.functions.*;
import io.reactivex.internal.subscriptions.BooleanSubscription;
import io.reactivex.observers.*;
import io.reactivex.plugins.RxJavaPlugins;
Expand Down Expand Up @@ -254,4 +255,41 @@ public void run() {
TestHelper.race(r1, r2, Schedulers.single());
}
}

@Test
public void noInterrupt() throws InterruptedException {
for (int k = 0; k < 100; k++) {
final int count = 10;
final CountDownLatch latch = new CountDownLatch(count);
final boolean[] interrupted = { false };

for (int i = 0; i < count; i++) {
Completable c0 = Completable.fromAction(new Action() {
@Override
public void run() throws Exception {
try {
Thread.sleep(30);
} catch (InterruptedException e) {
System.out.println("Interrupted! " + Thread.currentThread());
interrupted[0] = true;
}
}
});
Completable.concat(Arrays.asList(Completable.complete()
.subscribeOn(Schedulers.io())
.observeOn(Schedulers.io()),
c0)
)
.subscribe(new Action() {
@Override
public void run() throws Exception {
latch.countDown();
}
});
}

latch.await();
assertFalse("The second Completable was interrupted!", interrupted[0]);
}
}
}