Author: tallison
Date: Mon Mar 30 19:43:38 2015
New Revision: 1670185
URL: http://svn.apache.org/r1670185
Log:
TIKA-1330, trivial fixes to avoid NPE with consumersManagerMaxMillis parameter
Modified:
tika/trunk/tika-batch/src/main/java/org/apache/tika/batch/fs/builders/BasicTikaFSConsumersBuilder.java
tika/trunk/tika-batch/src/main/resources/org/apache/tika/batch/fs/default-tika-batch-config.xml
Modified:
tika/trunk/tika-batch/src/main/java/org/apache/tika/batch/fs/builders/BasicTikaFSConsumersBuilder.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-batch/src/main/java/org/apache/tika/batch/fs/builders/BasicTikaFSConsumersBuilder.java?rev=1670185&r1=1670184&r2=1670185&view=diff
==============================================================================
---
tika/trunk/tika-batch/src/main/java/org/apache/tika/batch/fs/builders/BasicTikaFSConsumersBuilder.java
(original)
+++
tika/trunk/tika-batch/src/main/java/org/apache/tika/batch/fs/builders/BasicTikaFSConsumersBuilder.java
Mon Mar 30 19:43:38 2015
@@ -66,13 +66,13 @@ public class BasicTikaFSConsumersBuilder
Long consumersManagerMaxMillis = null;
String consumersManagerMaxMillisString =
runtimeAttributes.get("consumersManagerMaxMillis");
if (consumersManagerMaxMillisString != null){
- consumersManagerMaxMillis =
PropsUtil.getLong(consumersManagerMaxMillisString, null);
- } else {
- Node consumersManagerMaxMillisNode =
node.getAttributes().getNamedItem("consumersManagerMaxMillis");
- if (consumersManagerMaxMillis == null) {
- consumersManagerMaxMillis =
PropsUtil.getLong(consumersManagerMaxMillisNode.getNodeValue(),
- null);
- }
+ consumersManagerMaxMillis =
PropsUtil.getLong(consumersManagerMaxMillisString, null);
+ } else {
+ Node consumersManagerMaxMillisNode =
node.getAttributes().getNamedItem("consumersManagerMaxMillis");
+ if (consumersManagerMaxMillis == null &&
consumersManagerMaxMillisNode != null) {
+ consumersManagerMaxMillis =
PropsUtil.getLong(consumersManagerMaxMillisNode.getNodeValue(),
+ null);
+ }
}
TikaConfig config = null;
Modified:
tika/trunk/tika-batch/src/main/resources/org/apache/tika/batch/fs/default-tika-batch-config.xml
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-batch/src/main/resources/org/apache/tika/batch/fs/default-tika-batch-config.xml?rev=1670185&r1=1670184&r2=1670185&view=diff
==============================================================================
---
tika/trunk/tika-batch/src/main/resources/org/apache/tika/batch/fs/default-tika-batch-config.xml
(original)
+++
tika/trunk/tika-batch/src/main/resources/org/apache/tika/batch/fs/default-tika-batch-config.xml
Mon Mar 30 19:43:38 2015
@@ -101,14 +101,13 @@
excludeFilePat="(?i).msg$"
maxFileSizeBytes="-1"
inputDir="input"
- />
--->
- <consumers
builderClass="org.apache.tika.batch.fs.builders.BasicTikaFSConsumersBuilder"
- recursiveParserWrapper="false">
- <parser class="org.apache.tika.batch.AutoDetectParserFactory"
parseRecursively="true"/>
- <contenthandler
builderClass="org.apache.tika.batch.builders.DefaultContentHandlerFactoryBuilder"
+ />
+-->
+ <consumers
builderClass="org.apache.tika.batch.fs.builders.BasicTikaFSConsumersBuilder"
+ recursiveParserWrapper="false"
consumersManagerMaxMillis="60000">
+ <parser class="org.apache.tika.batch.AutoDetectParserFactory"
parseRecursively="true"/>
+ <contenthandler
builderClass="org.apache.tika.batch.builders.DefaultContentHandlerFactoryBuilder"
basicHandlerType="xml" writeLimit="-1"/>
-
<!-- overwritePolicy: "skip" a file if output file exists, "rename" a
output file, "overwrite" -->
<!-- can include e.g. outputDir="output", but we don't want to include
this in the default! -->
<outputstream class="FSOutputStreamFactory" encoding="UTF-8"
outputSuffix="xml"/>
