Repository: tika Updated Branches: refs/heads/master e7e0886c8 -> 75fc12bb8
TIKA-1955: Updated to use mark() and reset() Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/75fc12bb Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/75fc12bb Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/75fc12bb Branch: refs/heads/master Commit: 75fc12bb83df079f7fa236e0b674274a8c36abde Parents: e7e0886 Author: David Meikle <[email protected]> Authored: Mon May 9 01:03:37 2016 +0100 Committer: David Meikle <[email protected]> Committed: Mon May 9 01:03:37 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/tika/detect/ZeroSizeFileDetector.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/75fc12bb/tika-core/src/main/java/org/apache/tika/detect/ZeroSizeFileDetector.java ---------------------------------------------------------------------- diff --git a/tika-core/src/main/java/org/apache/tika/detect/ZeroSizeFileDetector.java b/tika-core/src/main/java/org/apache/tika/detect/ZeroSizeFileDetector.java index d46bd21..fb986dc 100644 --- a/tika-core/src/main/java/org/apache/tika/detect/ZeroSizeFileDetector.java +++ b/tika-core/src/main/java/org/apache/tika/detect/ZeroSizeFileDetector.java @@ -30,8 +30,14 @@ public class ZeroSizeFileDetector implements Detector public MediaType detect(InputStream stream, Metadata metadata) throws IOException { if (stream != null) { - if(stream.read() == -1) { - return MediaType.EMPTY; + try { + stream.mark(1); + if (stream.read() == -1) { + return MediaType.EMPTY; + } + } + finally { + stream.reset(); } } return MediaType.OCTET_STREAM;
