You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2021/07/13 14:03:59 UTC

[tika] 03/03: TIKA-3474 -- handle 1.x container exception key

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git

commit 020430f80665aba8ea2d4c7f7efcda8bd4dca34a
Author: tallison <ta...@apache.org>
AuthorDate: Tue Jul 13 10:03:39 2021 -0400

    TIKA-3474 -- handle 1.x container exception key
---
 .../src/main/java/org/apache/tika/eval/app/AbstractProfiler.java  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/AbstractProfiler.java b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/AbstractProfiler.java
index 5e5756e..71616fb 100644
--- a/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/AbstractProfiler.java
+++ b/tika-eval/tika-eval-app/src/main/java/org/apache/tika/eval/app/AbstractProfiler.java
@@ -72,11 +72,16 @@ import org.apache.tika.exception.TikaException;
 import org.apache.tika.language.detect.LanguageResult;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.metadata.PagedText;
+import org.apache.tika.metadata.Property;
 import org.apache.tika.metadata.TikaCoreProperties;
 import org.apache.tika.sax.ToXMLContentHandler;
 
 public abstract class AbstractProfiler extends FileResourceConsumer {
 
+    //Container exception key from the 1.x branch
+    private static final Property CONTAINER_EXCEPTION_1X = Property.externalText("X-TIKA" +
+            ":EXCEPTION:runtime");
+
     public static final String TRUE = Boolean.toString(true);
     public static final String FALSE = Boolean.toString(false);
     protected static final AtomicInteger ID = new AtomicInteger();
@@ -558,6 +563,9 @@ public abstract class AbstractProfiler extends FileResourceConsumer {
     void getExceptionStrings(Metadata metadata, Map<Cols, String> data) {
 
         String fullTrace = metadata.get(TikaCoreProperties.CONTAINER_EXCEPTION);
+        if (fullTrace == null) {
+            fullTrace = metadata.get(CONTAINER_EXCEPTION_1X);
+        }
 
         if (fullTrace == null) {
             fullTrace = metadata.get(TikaCoreProperties.EMBEDDED_EXCEPTION);