Skip to content
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

Zip fix for multiple onCompleted and moved unsubscribe outside the lock. #767

Merged
merged 1 commit into from
Jan 21, 2014
Merged

Zip fix for multiple onCompleted and moved unsubscribe outside the lock. #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 26 additions & 17 deletions rxjava-core/src/main/java/rx/operators/OperationZip.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,19 +152,28 @@ public Subscription onSubscribe(final Observer<? super U> observer) {
final List<ItemObserver<T>> all = new ArrayList<ItemObserver<T>>();

Observer<List<T>> o2 = new Observer<List<T>>() {
boolean done;
@Override
public void onCompleted() {
observer.onCompleted();
if (!done) {
done = true;
observer.onCompleted();
}
}

@Override
public void onError(Throwable t) {
observer.onError(t);
if (!done) {
done = true;
observer.onError(t);
}
}

@Override
public void onNext(List<T> value) {
observer.onNext(selector.call(value.toArray(new Object[value.size()])));
if (!done) {
observer.onNext(selector.call(value.toArray(new Object[value.size()])));
}
}
};

Expand Down Expand Up @@ -251,14 +260,15 @@ public void onNext(T value) {
}
// run collector
if (rwLock.writeLock().tryLock()) {
boolean cu = false;
try {
while (true) {
List<T> values = new ArrayList<T>(all.size());
for (ItemObserver<T> io : all) {
if (io.queue.isEmpty()) {
if (io.done) {
observer.onCompleted();
cancel.unsubscribe();
cu = true;
return;
}
continue;
Expand All @@ -280,61 +290,60 @@ public void onNext(T value) {
}
} finally {
rwLock.writeLock().unlock();
if (cu) {
cancel.unsubscribe();
}
}
}
}

@Override
public void onError(Throwable ex) {
boolean c = false;
rwLock.writeLock().lock();
try {
if (done) {
return;
}
done = true;
c = true;
observer.onError(ex);
cancel.unsubscribe();
} finally {
rwLock.writeLock().unlock();
}
if (c) {
unsubscribe();
}
cancel.unsubscribe();
unsubscribe();
}

@Override
public void onCompleted() {
boolean c = false;
rwLock.readLock().lock();
try {
done = true;
c = true;
} finally {
rwLock.readLock().unlock();
}
if (rwLock.writeLock().tryLock()) {
boolean cu = false;
try {
for (ItemObserver<T> io : all) {
if (io.queue.isEmpty() && io.done) {
observer.onCompleted();
cancel.unsubscribe();
cu = true;
return;
}
}
} finally {
rwLock.writeLock().unlock();
if (cu) {
cancel.unsubscribe();
}
}
}
if (c) {
unsubscribe();
}
unsubscribe();
}

/** Connect to the source observable. */
public void connect() {
toSource.setSubscription(source.subscribe(this));
toSource.set(source.subscribe(this));
}

@Override
Expand Down
45 changes: 45 additions & 0 deletions rxjava-core/src/test/java/rx/operators/OperationZipTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1018,4 +1018,49 @@ public void remove() {
verify(o, never()).onCompleted();

}

@Test
public void testZipWithOnCompletedTwice() {
// issue: https://groups.google.com/forum/#!topic/rxjava/79cWTv3TFp0
// The problem is the original "zip" implementation does not wrap
// an internal observer with a SafeObserver. However, in the "zip",
// it may calls "onCompleted" twice. That breaks the Rx contract.

// This test tries to emulate this case.
// As "mock(Observer.class)" will create an instance in the package "rx",
// we need to wrap "mock(Observer.class)" with an observer instance
// which is in the package "rx.operators".
@SuppressWarnings("unchecked")
final Observer<Integer> observer = mock(Observer.class);

Observable.zip(Observable.from(1),
Observable.from(1), new Func2<Integer, Integer, Integer>() {
@Override
public Integer call(Integer a, Integer b) {
return a + b;
}
}).subscribe(new Observer<Integer>() {

@Override
public void onCompleted() {
observer.onCompleted();
}

@Override
public void onError(Throwable e) {
observer.onError(e);
}

@Override
public void onNext(Integer args) {
observer.onNext(args);
}

});

InOrder inOrder = inOrder(observer);
inOrder.verify(observer, times(1)).onNext(2);
inOrder.verify(observer, times(1)).onCompleted();
inOrder.verifyNoMoreInteractions();
}
}