Skip to content

fix #2497 #2501

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix #2497 #2501

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47bbe47
git checkout "fix #2497"
May 15, 2020
3970b88
Merge branch 'master' into master
jokermonn Dec 29, 2020
7d1783a
Merge branch 'main' into master
jokermonn May 2, 2022
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
14 changes: 5 additions & 9 deletions fbcore/src/main/java/com/facebook/datasource/AbstractDataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,30 +171,26 @@ public void subscribe(final DataSubscriber<T> dataSubscriber, final Executor exe
}

if (shouldNotify) {
notifyDataSubscriber(dataSubscriber, executor, hasFailed(), wasCancelled());
notifyDataSubscriber(dataSubscriber, executor);
}
}

private void notifyDataSubscribers() {
final boolean isFailure = hasFailed();
final boolean isCancellation = wasCancelled();
for (Pair<DataSubscriber<T>, Executor> pair : mSubscribers) {
notifyDataSubscriber(pair.first, pair.second, isFailure, isCancellation);
notifyDataSubscriber(pair.first, pair.second);
}
}

protected void notifyDataSubscriber(
final DataSubscriber<T> dataSubscriber,
final Executor executor,
final boolean isFailure,
final boolean isCancellation) {
final Executor executor) {
Runnable runnable =
new Runnable() {
@Override
public void run() {
if (isFailure) {
if (AbstractDataSource.this.hasFailed()) {
dataSubscriber.onFailure(AbstractDataSource.this);
} else if (isCancellation) {
} else if (AbstractDataSource.this.wasCancelled()) {
dataSubscriber.onCancellation(AbstractDataSource.this);
} else {
dataSubscriber.onNewResult(AbstractDataSource.this);
Expand Down