This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch branch_3x in repository https://gitbox.apache.org/repos/asf/tika.git
commit 16c0978b748816ec323c8369aa53fa8d0744986a Author: Tilman Hausherr <[email protected]> AuthorDate: Mon Oct 12 22:23:35 2026 +0200 Refactor exception handling for JackcessParser Co-authored-by: Copilot Autofix powered by AI <[email protected]> # Conflicts: # tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/JackcessParser.java --- tika-parent/pom.xml | 2 +- .../java/org/apache/tika/parser/microsoft/JackcessParser.java | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml index da17360e0f..f731704376 100644 --- a/tika-parent/pom.xml +++ b/tika-parent/pom.xml @@ -366,7 +366,7 @@ <imageio.version>1.4.0</imageio.version> <jackrabbit.version>2.22.5</jackrabbit.version> <jackson.version>2.22.3</jackson.version> - <jackcess.version>5.0.2</jackcess.version> + <jackcess.version>5.0.3</jackcess.version> <jackcess.encrypt.version>5.0.2</jackcess.encrypt.version> <jai.imageio.core.version>1.4.0</jai.imageio.core.version> <jakarta.activation.version>2.1.4</jakarta.activation.version> diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/JackcessParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/JackcessParser.java index 0b262543be..201ff6c6f9 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/JackcessParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-microsoft-module/src/main/java/org/apache/tika/parser/microsoft/JackcessParser.java @@ -33,7 +33,6 @@ import org.xml.sax.SAXException; import org.apache.tika.exception.CorruptedFileException; import org.apache.tika.exception.EncryptedDocumentException; import org.apache.tika.exception.TikaException; -import org.apache.tika.exception.UnsupportedFormatException; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.Property; @@ -102,10 +101,10 @@ public class JackcessParser implements Parser { JackcessExtractor ex = new JackcessExtractor(metadata, context, locale); ex.parse(db, xhtml); } catch (IOException e) { - //TIKA-3849 - if (e.getMessage() != null && e.getMessage().contains("Unrecognized map type: 75")) { - throw new UnsupportedFormatException( - "Jackcess doesn't process mdb versions before v97"); + String message = e.getMessage(); + if (message != null && (message.startsWith("invalid page number ") || + message.startsWith("Invalid usage map row "))) { + throw new TikaException("Corrupt Access database: " + message, e); } throw e; } catch (IndexOutOfBoundsException e) {
