This is an automated email from the ASF dual-hosted git repository. lfcnassif pushed a commit to branch branch_1x in repository https://gitbox.apache.org/repos/asf/tika.git
commit e11d428cf70468b436b9f9af8c14b138858dc6ca Author: Nassif <[email protected]> AuthorDate: Wed Jun 5 20:51:02 2019 -0300 TIKA-2892: fix deadlock with ForkParser --- .../src/main/java/org/apache/tika/fork/InputStreamResource.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tika-core/src/main/java/org/apache/tika/fork/InputStreamResource.java b/tika-core/src/main/java/org/apache/tika/fork/InputStreamResource.java index acdf3b0..147b41e 100644 --- a/tika-core/src/main/java/org/apache/tika/fork/InputStreamResource.java +++ b/tika-core/src/main/java/org/apache/tika/fork/InputStreamResource.java @@ -37,7 +37,10 @@ class InputStreamResource implements ForkResource { try { m = stream.read(buffer); } catch (IOException e) { - return e; + // returning exception causes deadlock + // return e; + e.printStackTrace(); + m = -1; } output.writeInt(m); if (m > 0) {
