Skip to content

Change a method name to make consistent with PR#6801 #7080

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
Sep 21, 2020
Merged

Change a method name to make consistent with PR#6801 #7080

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
8 changes: 4 additions & 4 deletions src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public void onNext(T t) {
u = Objects.requireNonNull(iterator.next(), "The iterator returned a null value");
} catch (Throwable e) {
Exceptions.throwIfFatal(e);
error(e);
fail(e);
return;
}

Expand All @@ -121,7 +121,7 @@ public void onNext(T t) {
v = Objects.requireNonNull(zipper.apply(t, u), "The zipper function returned a null value");
} catch (Throwable e) {
Exceptions.throwIfFatal(e);
error(e);
fail(e);
return;
}

Expand All @@ -133,7 +133,7 @@ public void onNext(T t) {
b = iterator.hasNext();
} catch (Throwable e) {
Exceptions.throwIfFatal(e);
error(e);
fail(e);
return;
}

Expand All @@ -144,7 +144,7 @@ public void onNext(T t) {
}
}

void error(Throwable e) {
void fail(Throwable e) {
done = true;
upstream.dispose();
downstream.onError(e);
Expand Down