Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
88daaa88
authored
May 01, 2015
by
Oliver Woodman
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fix NPE if source is released having never been prepared.
parent
837090e8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
library/src/main/java/com/google/android/exoplayer/FrameworkSampleSource.java
library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java
library/src/main/java/com/google/android/exoplayer/FrameworkSampleSource.java
View file @
88daaa88
...
@@ -234,7 +234,7 @@ public final class FrameworkSampleSource implements SampleSource {
...
@@ -234,7 +234,7 @@ public final class FrameworkSampleSource implements SampleSource {
@Override
@Override
public
void
release
()
{
public
void
release
()
{
Assertions
.
checkState
(
remainingReleaseCount
>
0
);
Assertions
.
checkState
(
remainingReleaseCount
>
0
);
if
(--
remainingReleaseCount
==
0
)
{
if
(--
remainingReleaseCount
==
0
&&
extractor
!=
null
)
{
extractor
.
release
();
extractor
.
release
();
extractor
=
null
;
extractor
=
null
;
}
}
...
...
library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java
View file @
88daaa88
...
@@ -313,7 +313,7 @@ public class ExtractorSampleSource implements SampleSource, ExtractorOutput, Loa
...
@@ -313,7 +313,7 @@ public class ExtractorSampleSource implements SampleSource, ExtractorOutput, Loa
@Override
@Override
public
void
release
()
{
public
void
release
()
{
Assertions
.
checkState
(
remainingReleaseCount
>
0
);
Assertions
.
checkState
(
remainingReleaseCount
>
0
);
if
(--
remainingReleaseCount
==
0
)
{
if
(--
remainingReleaseCount
==
0
&&
loader
!=
null
)
{
loader
.
release
();
loader
.
release
();
loader
=
null
;
loader
=
null
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment