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

Fix issue 426 - send messages to dead thread. #624

Closed
wants to merge 7 commits into from
Closed

Fix issue 426 - send messages to dead thread. #624

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b5e02b9
Merge pull request #1 from google/master
MaTriXy Jul 15, 2015
8e6ae34
Handle not sending messages to dead thread.
MaTriXy Jul 15, 2015
ebc7341
Apply code formatting
MaTriXy Jul 15, 2015
892d99d
Update Loader.java
MaTriXy Jul 15, 2015
9ffee61
Update Loader.java
MaTriXy Jul 15, 2015
a7e373b
Merge pull request #2 from google/master
MaTriXy Jul 27, 2015
c4a01d4
Merge pull request #3 from google/master
MaTriXy Oct 8, 2015
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
12 changes: 9 additions & 3 deletions library/src/main/java/com/google/android/exoplayer/upstream/Loader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,13 +209,13 @@ public void run() {
loadable.load();
TraceUtil.endSection();
}
sendEmptyMessage(MSG_END_OF_SOURCE);
passEmptyMessage(MSG_END_OF_SOURCE);
} catch (IOException e) {
obtainMessage(MSG_IO_EXCEPTION, e).sendToTarget();
} catch (InterruptedException e) {
// The load was canceled.
Assertions.checkState(loadable.isLoadCanceled());
sendEmptyMessage(MSG_END_OF_SOURCE);
passEmptyMessage(MSG_END_OF_SOURCE);
} catch (Exception e) {
// This should never happen, but handle it anyway.
Log.e(TAG, "Unexpected exception loading stream", e);
Expand All @@ -229,7 +229,13 @@ public void run() {
throw e;
}
}


private void passEmptyMessage(int what){
if (getLooper().getThread().getState() != Thread.State.TERMINATED){
sendEmptyMessage(what);
}
}

@Override
public void handleMessage(Message msg) {
if (msg.what == MSG_FATAL_ERROR) {
Expand Down