Skip to content

Fix issue #1812 that zip may swallow requests #1813

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 1 commit into from
Oct 31, 2014
Merged

Fix issue #1812 that zip may swallow requests #1813

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
4 changes: 3 additions & 1 deletion src/main/java/rx/internal/operators/OperatorZip.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ void tick() {
if (COUNTER_UPDATER.getAndIncrement(this) == 0) {
do {
// we only emit if requested > 0
if (requested.get() > 0) {
while (requested.get() > 0) {
Copy link
Member Author

Choose a reason for hiding this comment

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

@benjchristensen I cannot understand why this used if. Do you remember?

Copy link
Member

Choose a reason for hiding this comment

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

I can't remember.

final Object[] vs = new Object[observers.length];
boolean allHaveValues = true;
for (int i = 0; i < observers.length; i++) {
Expand Down Expand Up @@ -279,6 +279,8 @@ void tick() {
}
emitted = 0;
}
} else {
break;
}
}
} while (COUNTER_UPDATER.decrementAndGet(this) > 0);
Expand Down
26 changes: 26 additions & 0 deletions src/test/java/rx/internal/operators/OperatorZipTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,4 +1217,30 @@ public void run() {

});
}

@Test(timeout = 30000)
public void testIssue1812() {
// https://github.com/ReactiveX/RxJava/issues/1812
Observable<Integer> zip1 = Observable.zip(Observable.range(0, 1026), Observable.range(0, 1026),
new Func2<Integer, Integer, Integer>() {

@Override
public Integer call(Integer i1, Integer i2) {
return i1 + i2;
}
});
Observable<Integer> zip2 = Observable.zip(zip1, Observable.range(0, 1026),
new Func2<Integer, Integer, Integer>() {

@Override
public Integer call(Integer i1, Integer i2) {
return i1 + i2;
}
});
List<Integer> expected = new ArrayList<Integer>();
for (int i = 0; i < 1026; i++) {
expected.add(i * 3);
}
assertEquals(expected, zip2.toList().toBlocking().single());
}
}