This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch branch_3x in repository https://gitbox.apache.org/repos/asf/tika.git
commit 65bf98d3c54e1500878398210ef64aafe2dcb589 Author: tallison <[email protected]> AuthorDate: Tue Feb 3 08:10:23 2026 -0500 TIKA-4646 -- extract hyperlinks from instrText and other areas in ooxml(#2578) fix merge conflicts (cherry picked from commit bef2d336b1e4e52e3ca262d656f93ee4d3145b5f) --- .../src/main/java/org/apache/tika/parser/AutoDetectParser.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java b/tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java index 59882f8961..b4790e6980 100644 --- a/tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java +++ b/tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java @@ -34,7 +34,6 @@ import org.apache.tika.io.TemporaryResources; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.HttpHeaders; import org.apache.tika.metadata.Metadata; -import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.mime.MediaType; import org.apache.tika.mime.MediaTypeRegistry; import org.apache.tika.sax.SecureContentHandler; @@ -177,12 +176,7 @@ public class AutoDetectParser extends CompositeParser { // Automatically detect the MIME type of the document MediaType type = detector.detect(tis, metadata); - //update CONTENT_TYPE as long as it wasn't set by parser override - if (metadata.get(TikaCoreProperties.CONTENT_TYPE_PARSER_OVERRIDE) == null || - !metadata.get(TikaCoreProperties.CONTENT_TYPE_PARSER_OVERRIDE) - .equals(type.toString())) { - metadata.set(Metadata.CONTENT_TYPE, type.toString()); - } + metadata.set(Metadata.CONTENT_TYPE, type.toString()); //check for zero-byte inputstream if (tis.getOpenContainer() == null) { if (autoDetectParserConfig.getThrowOnZeroBytes()) {
