This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch branch_1x in repository https://gitbox.apache.org/repos/asf/tika.git
View the commit online: https://github.com/apache/tika/commit/ff93d145d5e176047b5609233d97a5c78804b795 commit ff93d145d5e176047b5609233d97a5c78804b795 Author: tallison <[email protected]> AuthorDate: Wed Nov 20 17:16:24 2019 -0500 TIKA-2994 -- ExceptionUtils should not extract cause from subclasses of TikaException --- tika-core/src/main/java/org/apache/tika/utils/ExceptionUtils.java | 2 +- .../test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tika-core/src/main/java/org/apache/tika/utils/ExceptionUtils.java b/tika-core/src/main/java/org/apache/tika/utils/ExceptionUtils.java index 190d977..1b7a0a5 100644 --- a/tika-core/src/main/java/org/apache/tika/utils/ExceptionUtils.java +++ b/tika-core/src/main/java/org/apache/tika/utils/ExceptionUtils.java @@ -44,7 +44,7 @@ public class ExceptionUtils { */ public static String getFilteredStackTrace(Throwable t) { Throwable cause = t; - if ((t instanceof TikaException) && + if ((t.getClass().equals(TikaException.class)) && t.getCause() != null) { cause = t.getCause(); } diff --git a/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java b/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java index 93243da..38773be 100644 --- a/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java +++ b/tika-server/src/test/java/org/apache/tika/server/RecursiveMetadataResourceTest.java @@ -104,7 +104,7 @@ public class RecursiveMetadataResourceTest extends CXFTestBase { List<Metadata> metadataList = JsonMetadataList.fromJson(reader); assertNotNull(metadataList.get(0).get(TikaCoreProperties.CREATOR)); - assertContains("EncryptedDocumentException", metadataList.get(0).get(RecursiveParserWrapperHandler.CONTAINER_EXCEPTION)); + assertContains("org.apache.tika.exception.EncryptedDocumentException", metadataList.get(0).get(RecursiveParserWrapperHandler.CONTAINER_EXCEPTION)); // Try again, this time with the password response = WebClient .create(endPoint + META_PATH)
