You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by gr...@apache.org on 2015/03/30 16:23:24 UTC
svn commit: r1670105 - in /tika/trunk:
tika-core/src/main/java/org/apache/tika/fork/ForkClient.java
tika-core/src/main/java/org/apache/tika/fork/ForkParser.java
tika-parsers/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java
Author: grossws
Date: Mon Mar 30 14:23:24 2015
New Revision: 1670105
URL: http://svn.apache.org/r1670105
Log:
ForkParser.setJavaCommand takes List<String> now
Contributed by: Oleg Oshmyan <ch...@inbox.lv>
Modified:
tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkClient.java
tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkParser.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java
Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkClient.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkClient.java?rev=1670105&r1=1670104&r2=1670105&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkClient.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkClient.java Mon Mar 30 14:23:24 2015
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.NotSerializableException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
@@ -51,7 +50,7 @@ class ForkClient {
private final InputStream error;
- public ForkClient(ClassLoader loader, Object object, String java)
+ public ForkClient(ClassLoader loader, Object object, List<String> java)
throws IOException, TikaException {
boolean ok = false;
try {
@@ -60,7 +59,7 @@ class ForkClient {
ProcessBuilder builder = new ProcessBuilder();
List<String> command = new ArrayList<String>();
- command.addAll(Arrays.asList(java.split("\\s+")));
+ command.addAll(java);
command.add("-jar");
command.add(jar.getPath());
builder.command(command);
Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkParser.java?rev=1670105&r1=1670104&r2=1670105&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkParser.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/fork/ForkParser.java Mon Mar 30 14:23:24 2015
@@ -18,7 +18,9 @@ package org.apache.tika.fork;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Arrays;
import java.util.LinkedList;
+import java.util.List;
import java.util.Queue;
import java.util.Set;
@@ -43,7 +45,7 @@ public class ForkParser extends Abstract
private final Parser parser;
/** Java command line */
- private String java = "java -Xmx32m";
+ private List<String> java = Arrays.asList("java", "-Xmx32m");
/** Process pool size */
private int poolSize = 5;
@@ -96,19 +98,19 @@ public class ForkParser extends Abstract
*
* @return java command line
*/
- public String getJavaCommand() {
+ public List<String> getJavaCommand() {
return java;
}
/**
* Sets the command used to start the forked server process.
- * The given command line is split on whitespace and the arguments
- * "-jar" and "/path/to/bootstrap.jar" are appended to it when starting
- * the process. The default setting is "java -Xmx32m".
+ * The arguments "-jar" and "/path/to/bootstrap.jar" are
+ * appended to the given command when starting the process.
+ * The default setting is {"java", "-Xmx32m"}.
*
* @param java java command line
*/
- public void setJavaCommand(String java) {
+ public void setJavaCommand(List<String> java) {
this.java = java;
}
Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java?rev=1670105&r1=1670104&r2=1670105&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/fork/ForkParserIntegrationTest.java Mon Mar 30 14:23:24 2015
@@ -225,9 +225,8 @@ public class ForkParserIntegrationTest {
ForkParser parser = new ForkParser(
ForkParserIntegrationTest.class.getClassLoader(),
tika.getParser());
- parser.setJavaCommand(
- "java -Xmx32m -Xdebug -Xrunjdwp:"
- + "transport=dt_socket,address=54321,server=y,suspend=n");
+ parser.setJavaCommand(Arrays.asList("java", "-Xmx32m", "-Xdebug",
+ "-Xrunjdwp:transport=dt_socket,address=54321,server=y,suspend=n"));
try {
ContentHandler body = new BodyContentHandler();
InputStream stream = ForkParserIntegrationTest.class.getResourceAsStream(