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 2018/09/18 18:15:33 UTC
[tika] 06/06: TIKA-2729 -- child process should run in headless
mode.
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
commit ed1e2f398badff61dfc234e2dd299bbcd0947c73
Author: TALLISON <ta...@apache.org>
AuthorDate: Tue Sep 18 14:10:22 2018 -0400
TIKA-2729 -- child process should run in headless mode.
---
.../src/main/java/org/apache/tika/server/TikaServerWatchDog.java | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/tika-server/src/main/java/org/apache/tika/server/TikaServerWatchDog.java b/tika-server/src/main/java/org/apache/tika/server/TikaServerWatchDog.java
index d9b3c54..8c780cd 100644
--- a/tika-server/src/main/java/org/apache/tika/server/TikaServerWatchDog.java
+++ b/tika-server/src/main/java/org/apache/tika/server/TikaServerWatchDog.java
@@ -128,11 +128,20 @@ public class TikaServerWatchDog {
private static List<String> extractJVMArgs(String[] args) {
List<String> jvmArgs = new ArrayList<>();
+ boolean foundHeadlessOption = false;
for (int i = 0; i < args.length; i++) {
if (args[i].startsWith("-J")) {
jvmArgs.add("-"+args[i].substring(2));
}
+ if (args[i].contains("java.awt.headless")) {
+ foundHeadlessOption = true;
+ }
+ }
+ //if user has already specified headless...don't modify
+ if (! foundHeadlessOption) {
+ jvmArgs.add("-Djava.awt.headless=true");
}
+
return jvmArgs;
}