diff options
author | Paul Duffin <paulduffin@google.com> | 2015-01-19 12:46:40 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-19 12:46:40 +0000 |
commit | aab56800fcb95e9b1a2d653588b14158080cc6b4 (patch) | |
tree | 7365392c3ea77742021cf187acfd465f9bb774ab /guava/src/com/google/common/io/MultiInputStream.java | |
parent | 6fa98dbaae182b511fbeb331e08f5fb827715ea8 (diff) | |
parent | 84fb43aa6a1e752487f2624055ff26b1b6b7c043 (diff) | |
download | android_external_guava-aab56800fcb95e9b1a2d653588b14158080cc6b4.tar.gz android_external_guava-aab56800fcb95e9b1a2d653588b14158080cc6b4.tar.bz2 android_external_guava-aab56800fcb95e9b1a2d653588b14158080cc6b4.zip |
am 84fb43aa: Merge "Revert "Upgraded Guava to unmodified v14.0.1""
* commit '84fb43aa6a1e752487f2624055ff26b1b6b7c043':
Revert "Upgraded Guava to unmodified v14.0.1"
Diffstat (limited to 'guava/src/com/google/common/io/MultiInputStream.java')
-rw-r--r-- | guava/src/com/google/common/io/MultiInputStream.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/guava/src/com/google/common/io/MultiInputStream.java b/guava/src/com/google/common/io/MultiInputStream.java index 1902baf..f8f1a0b 100644 --- a/guava/src/com/google/common/io/MultiInputStream.java +++ b/guava/src/com/google/common/io/MultiInputStream.java @@ -16,14 +16,10 @@ package com.google.common.io; -import static com.google.common.base.Preconditions.checkNotNull; - import java.io.IOException; import java.io.InputStream; import java.util.Iterator; -import javax.annotation.Nullable; - /** * An {@link InputStream} that concatenates multiple substreams. At most * one stream will be open at a time. @@ -44,7 +40,7 @@ final class MultiInputStream extends InputStream { public MultiInputStream( Iterator<? extends InputSupplier<? extends InputStream>> it) throws IOException { - this.it = checkNotNull(it); + this.it = it; advance(); } @@ -91,7 +87,7 @@ final class MultiInputStream extends InputStream { return result; } - @Override public int read(@Nullable byte[] b, int off, int len) throws IOException { + @Override public int read(byte[] b, int off, int len) throws IOException { if (in == null) { return -1; } |