Repository: tika Updated Branches: refs/heads/master be66dac95 -> a91d08360
TIKA-1955: Updated check to read from stream to avoid misreporting due to blocking Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/a91d0836 Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/a91d0836 Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/a91d0836 Branch: refs/heads/master Commit: a91d083602f716e3fb92b9b791fd602deceef513 Parents: be66dac Author: David Meikle <[email protected]> Authored: Sun May 8 23:09:29 2016 +0100 Committer: David Meikle <[email protected]> Committed: Sun May 8 23:09:29 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/tika/detect/ZeroSizeFileDetector.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/a91d0836/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 524e80c..f39b45a 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 @@ -29,10 +29,11 @@ public class ZeroSizeFileDetector implements Detector { public MediaType detect(InputStream stream, Metadata metadata) throws IOException { - if(stream != null && stream.available() == 0) { - return MediaType.ZERO_SIZE; - } else { - return MediaType.OCTET_STREAM; + if (stream != null) { + if(stream.read() == -1) { + return MediaType.ZERO_SIZE; + } } + return MediaType.OCTET_STREAM; } }
