This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch TIKA-4515b in repository https://gitbox.apache.org/repos/asf/tika.git
commit fba0d9c54c4a434f907def65e5ce5ed2b62e1c93 Author: tallison <[email protected]> AuthorDate: Wed Oct 22 08:16:44 2025 -0400 TIKA-4515 bug fixes --- .../src/main/java/org/apache/tika/async/cli/TikaAsyncCLI.java | 2 +- .../java/org/apache/tika/async/cli/TikaConfigAsyncWriter.java | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tika-pipes/tika-async-cli/src/main/java/org/apache/tika/async/cli/TikaAsyncCLI.java b/tika-pipes/tika-async-cli/src/main/java/org/apache/tika/async/cli/TikaAsyncCLI.java index 8dff25ab3..c2b4389d7 100644 --- a/tika-pipes/tika-async-cli/src/main/java/org/apache/tika/async/cli/TikaAsyncCLI.java +++ b/tika-pipes/tika-async-cli/src/main/java/org/apache/tika/async/cli/TikaAsyncCLI.java @@ -52,7 +52,7 @@ public class TikaAsyncCLI { options.addOption("i", "inputDir", true, "input directory"); options.addOption("o", "outputDir", true, "output directory"); options.addOption("n", "numClients", true, "number of forked clients"); - options.addOption("X", "Xmx", true, "heap for the forked clients in usual jvm heap amount, e.g. -x 1g"); + options.addOption("X", "Xmx", true, "heap for the forked clients in usual jvm heap amount, e.g. -X 1g"); options.addOption("?", "help", false, "this help message"); options.addOption("T", "timeoutMs", true, "timeout for each parse in milliseconds"); options.addOption("h", "handlerType", true, "handler type: t=text, h=html, x=xml, b=body, i=ignore"); diff --git a/tika-pipes/tika-async-cli/src/main/java/org/apache/tika/async/cli/TikaConfigAsyncWriter.java b/tika-pipes/tika-async-cli/src/main/java/org/apache/tika/async/cli/TikaConfigAsyncWriter.java index 7452a5877..18023d629 100644 --- a/tika-pipes/tika-async-cli/src/main/java/org/apache/tika/async/cli/TikaConfigAsyncWriter.java +++ b/tika-pipes/tika-async-cli/src/main/java/org/apache/tika/async/cli/TikaConfigAsyncWriter.java @@ -85,11 +85,9 @@ class TikaConfigAsyncWriter { Path baseInput = Paths.get(simpleAsyncConfig.getInputDir()); Path baseOutput = Paths.get(simpleAsyncConfig.getOutputDir()); if (Files.isRegularFile(baseInput)) { - if (baseInput.equals(baseOutput)) { - baseInput = baseInput.getParent(); - baseOutput = baseInput; - } else { - baseInput = baseInput.getParent(); + baseInput = baseInput.toAbsolutePath().getParent(); + if (baseInput == null) { + throw new IllegalArgumentException("input file must be at least one directory below root"); } }
