From 444dbeb4c405045dd5b51e1f68fa144f1989a3fe Mon Sep 17 00:00:00 2001 From: eguven Date: Tue, 27 Jun 2017 01:45:13 -0700 Subject: [PATCH] Fix NPE in FakeDataSource.close() If open() fails because of the file isn't available then fakeData is null. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=160249214 --- .../com/google/android/exoplayer2/testutil/FakeDataSource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java index 4d42c3e48e..b3f76391e4 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java @@ -199,7 +199,7 @@ public final class FakeDataSource implements DataSource { Assertions.checkState(opened); opened = false; uri = null; - if (currentSegmentIndex < fakeData.segments.size()) { + if (fakeData != null && currentSegmentIndex < fakeData.segments.size()) { Segment current = fakeData.segments.get(currentSegmentIndex); if (current.isErrorSegment() && current.exceptionThrown) { current.exceptionCleared = true;