This is an automated email from the ASF dual-hosted git repository.
piergiorgio pushed a commit to branch CONNECTORS-1779
in repository https://gitbox.apache.org/repos/asf/manifoldcf.git
The following commit(s) were added to refs/heads/CONNECTORS-1779 by this push:
new 319feeb78 added config flag for Tika (@CONNECTORS-1778), nuxeo client
(CONNECTORS-1782), NPE on rollback for MySQL (CONNECTORS-1781)
319feeb78 is described below
commit 319feeb78d4ad3a7cb1a72904b3167f12112d037
Author: Piergiorgio Lucidi <[email protected]>
AuthorDate: Tue Mar 10 13:36:57 2026 +0100
added config flag for Tika (@CONNECTORS-1778), nuxeo client
(CONNECTORS-1782), NPE on rollback for MySQL (CONNECTORS-1781)
---
build.xml | 4 +-
.../agents/output/kafka/BaseITHSQLDB.java | 4 +-
.../manifoldcf/agents/output/kafka/KafkaLocal.java | 68 +++++++++++-----------
connectors/nuxeo/pom.xml | 10 +++-
.../transformation/tikaservice/TikaExtractor.java | 51 ++++++++++++++--
.../tikaservice/common_en_US.properties | 1 +
.../tikaservice/common_es_ES.properties | 1 +
.../tikaservice/common_ja_JP.properties | 1 +
.../tikaservice/common_zh_CN.properties | 1 +
.../editSpecification_FieldMapping.html | 12 ++++
.../tikaservice/viewSpecification.html | 5 ++
.../manifoldcf/core/database/DBInterfaceMySQL.java | 6 +-
12 files changed, 117 insertions(+), 47 deletions(-)
diff --git a/build.xml b/build.xml
index b50839a18..693490733 100644
--- a/build.xml
+++ b/build.xml
@@ -920,7 +920,7 @@ Use Apache Forrest version forrest-0.9-dev or higher.
</target>
<target name="setup-nuxeo-url">
- <property name="nuxeo-base-url"
value="https://packages.nuxeo.com/repository/maven-public-archives"/>
+ <property name="nuxeo-base-url"
value="https://packages.nuxeo.com/repository/maven-public-releases"/>
</target>
<target name="download-via-nuxeo" depends="setup-nuxeo-url">
@@ -931,7 +931,7 @@ Use Apache Forrest version forrest-0.9-dev or higher.
<mkdir dir="lib"/>
<antcall target="download-via-nuxeo">
<param name="project-path" value="org/nuxeo/client"/>
- <param name="artifact-version" value="3.0.1"/>
+ <param name="artifact-version" value="3.2.0"/>
<param name="target" value="lib"/>
<param name="artifact-name" value="nuxeo-java-client"/>
<param name="artifact-type" value="jar"/>
diff --git
a/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/BaseITHSQLDB.java
b/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/BaseITHSQLDB.java
index 305608a2a..034a84cb5 100644
---
a/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/BaseITHSQLDB.java
+++
b/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/BaseITHSQLDB.java
@@ -89,7 +89,9 @@ public class BaseITHSQLDB extends
org.apache.manifoldcf.crawler.tests.BaseITHSQL
@After
public void cleanUpKafka() {
- kafka.stop();
+ if (kafka != null) {
+ kafka.stop();
+ }
}
}
diff --git
a/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/KafkaLocal.java
b/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/KafkaLocal.java
index 38dd75ae3..beaba14f5 100644
---
a/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/KafkaLocal.java
+++
b/connectors/kafka/connector/src/test/java/org/apache/manifoldcf/agents/output/kafka/KafkaLocal.java
@@ -1,20 +1,20 @@
-/**
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-package org.apache.manifoldcf.agents.output.kafka;
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.manifoldcf.agents.output.kafka;
import java.io.IOException;
import java.util.Properties;
@@ -28,11 +28,11 @@ public class KafkaLocal {
public ZooKeeperLocal zookeeper;
public KafkaLocal(Properties kafkaProperties, Properties zkProperties)
throws IOException, InterruptedException {
- KafkaConfig kafkaConfig = new KafkaConfig(kafkaProperties);
-
- //start local zookeeper
- System.out.println("starting local zookeeper...");
- zookeeper = new ZooKeeperLocal(zkProperties);
+ KafkaConfig kafkaConfig = new KafkaConfig(kafkaProperties);
+
+ //start local zookeeper
+ System.out.println("starting local zookeeper...");
+ zookeeper = new ZooKeeperLocal(zkProperties);
System.out.println("done");
//start local kafka broker
@@ -40,14 +40,16 @@ public class KafkaLocal {
System.out.println("starting local kafka broker...");
kafka.startup();
- System.out.println("done");
- }
-
- public void stop() {
- //stop kafka broker
- System.out.println("stopping kafka...");
- kafka.shutdown();
- System.out.println("done");
- }
-
-}
+ System.out.println("done");
+ }
+
+ public void stop() {
+ //stop kafka broker
+ System.out.println("stopping kafka...");
+ if (kafka != null) {
+ kafka.shutdown();
+ }
+ System.out.println("done");
+ }
+
+}
diff --git a/connectors/nuxeo/pom.xml b/connectors/nuxeo/pom.xml
index d3763e275..d02e10b9a 100755
--- a/connectors/nuxeo/pom.xml
+++ b/connectors/nuxeo/pom.xml
@@ -52,7 +52,13 @@
<repositories>
<repository>
<id>public-releases</id>
- <url>https://packages.nuxeo.com/repository/maven-public-archives</url>
+ <url>https://packages.nuxeo.com/repository/maven-public-releases</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
</repositories>
<!-- Nuxeo repositories -->
@@ -377,7 +383,7 @@
<dependency>
<groupId>org.nuxeo.client</groupId>
<artifactId>nuxeo-java-client</artifactId>
- <version>3.0.1</version>
+ <version>3.2.0</version>
</dependency>
</dependencies>
diff --git
a/connectors/tikaservice/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tikaservice/TikaExtractor.java
b/connectors/tikaservice/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tikaservice/TikaExtractor.java
index ea9895abd..a24607de8 100644
---
a/connectors/tikaservice/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tikaservice/TikaExtractor.java
+++
b/connectors/tikaservice/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tikaservice/TikaExtractor.java
@@ -608,6 +608,9 @@ public class TikaExtractor extends
org.apache.manifoldcf.agents.transformation.B
response = this.httpClient.execute(tikaHost, httpPut);
//System.out.println("PUT successful");
} catch (IOException e) {
+ if (sp.ignoreException()) {
+ return handleTikaServerException(e);
+ }
// Retry for 10 minutes, 10000 ms between retries, and abort if
doesn't work
final long currentTime = System.currentTimeMillis();
throw new ServiceInterruption("Tika down, retrying:
"+e.getMessage(),e,currentTime + 10000L,
@@ -641,6 +644,9 @@ public class TikaExtractor extends
org.apache.manifoldcf.agents.transformation.B
tikaServerIs.close();
}
} else if (responseCode == 503) {
+ if (sp.ignoreException()) {
+ return handleTikaServerRejects("Tika restarting, retrying");
+ }
// Service interruption; Tika trying to come up.
// Retry for 10 minutes, 10000 ms between retries, and abort if
doesn't work
final long currentTime = System.currentTimeMillis();
@@ -675,6 +681,9 @@ public class TikaExtractor extends
org.apache.manifoldcf.agents.transformation.B
response = this.httpClient.execute(tikaHost, httpPut);
//System.out.println("... content PUT succeeded");
} catch (IOException e) {
+ if (sp.ignoreException()) {
+ return handleTikaServerException(e);
+ }
// Retry for 10 minutes, 10000 ms between retries, and abort if
doesn't work
final long currentTime = System.currentTimeMillis();
throw new ServiceInterruption("Tika down, retrying:
"+e.getMessage(),e,currentTime + 10000L,
@@ -697,6 +706,9 @@ public class TikaExtractor extends
org.apache.manifoldcf.agents.transformation.B
tikaServerIs.close();
}
} else if (responseCode == 503) {
+ if (sp.ignoreException()) {
+ return handleTikaServerRejects("Tika restarting, retrying");
+ }
// Service interruption; Tika trying to come up.
// Retry for 10 minutes, 10000 ms between retries, and abort if
doesn't work
final long currentTime = System.currentTimeMillis();
@@ -925,7 +937,8 @@ public class TikaExtractor extends
org.apache.manifoldcf.agents.transformation.B
while (i < os.getChildCount()) {
SpecificationNode node = os.getChild(i);
if (node.getType().equals(TikaConfig.NODE_FIELDMAP) ||
node.getType().equals(TikaConfig.NODE_KEEPMETADATA)
- || node.getType().equals(TikaConfig.NODE_LOWERNAMES) ||
node.getType().equals(TikaConfig.NODE_WRITELIMIT))
+ || node.getType().equals(TikaConfig.NODE_LOWERNAMES) ||
node.getType().equals(TikaConfig.NODE_WRITELIMIT)
+ || node.getType().equals(TikaConfig.NODE_IGNORETIKAEXCEPTION))
os.removeChild(i);
else
i++;
@@ -982,14 +995,23 @@ public class TikaExtractor extends
org.apache.manifoldcf.agents.transformation.B
}
os.addChild(os.getChildCount(), node2);
- SpecificationNode node3 = new
SpecificationNode(TikaConfig.NODE_WRITELIMIT);
+ SpecificationNode node3 = new
SpecificationNode(TikaConfig.NODE_IGNORETIKAEXCEPTION);
+ String ignore = variableContext.getParameter(seqPrefix +
"ignoretikaexceptions");
+ if (ignore != null) {
+ node3.setAttribute(TikaConfig.ATTRIBUTE_VALUE, ignore);
+ } else {
+ node3.setAttribute(TikaConfig.ATTRIBUTE_VALUE, "false");
+ }
+ os.addChild(os.getChildCount(), node3);
+
+ SpecificationNode node4 = new
SpecificationNode(TikaConfig.NODE_WRITELIMIT);
String writeLimit = variableContext.getParameter(seqPrefix +
"writelimit");
if (writeLimit != null) {
- node3.setAttribute(TikaConfig.ATTRIBUTE_VALUE, writeLimit);
+ node4.setAttribute(TikaConfig.ATTRIBUTE_VALUE, writeLimit);
} else {
- node3.setAttribute(TikaConfig.ATTRIBUTE_VALUE, "");
+ node4.setAttribute(TikaConfig.ATTRIBUTE_VALUE, "");
}
- os.addChild(os.getChildCount(), node3);
+ os.addChild(os.getChildCount(), node4);
}
return null;
@@ -1028,6 +1050,7 @@ public class TikaExtractor extends
org.apache.manifoldcf.agents.transformation.B
List<Map<String, String>> fieldMappings = new ArrayList<Map<String,
String>>();
String keepAllMetadataValue = "true";
String lowernamesValue = "false";
+ String ignoreExceptionValue = "true";
String writeLimitValue = "";
for (int i = 0; i < os.getChildCount(); i++) {
SpecificationNode sn = os.getChild(i);
@@ -1049,6 +1072,8 @@ public class TikaExtractor extends
org.apache.manifoldcf.agents.transformation.B
keepAllMetadataValue =
sn.getAttributeValue(TikaConfig.ATTRIBUTE_VALUE);
} else if (sn.getType().equals(TikaConfig.NODE_LOWERNAMES)) {
lowernamesValue = sn.getAttributeValue(TikaConfig.ATTRIBUTE_VALUE);
+ } else if (sn.getType().equals(TikaConfig.NODE_IGNORETIKAEXCEPTION)) {
+ ignoreExceptionValue =
sn.getAttributeValue(TikaConfig.ATTRIBUTE_VALUE);
} else if (sn.getType().equals(TikaConfig.NODE_WRITELIMIT)) {
writeLimitValue = sn.getAttributeValue(TikaConfig.ATTRIBUTE_VALUE);
}
@@ -1056,6 +1081,7 @@ public class TikaExtractor extends
org.apache.manifoldcf.agents.transformation.B
paramMap.put("FIELDMAPPINGS", fieldMappings);
paramMap.put("KEEPALLMETADATA", keepAllMetadataValue);
paramMap.put("LOWERNAMES", lowernamesValue);
+ paramMap.put("IGNORETIKAEXCEPTIONS", ignoreExceptionValue);
paramMap.put("WRITELIMIT", writeLimitValue);
}
@@ -1219,13 +1245,14 @@ public class TikaExtractor extends
org.apache.manifoldcf.agents.transformation.B
private final Map<String, String> sourceTargets = new HashMap<String,
String>();
private final boolean keepAllMetadata;
private final boolean lowerNames;
+ private final boolean ignoreException;
private final int writeLimit;
public SpecPacker(Specification os) {
boolean keepAllMetadata = true;
boolean lowerNames = false;
int writeLimit = TikaConfig.WRITELIMIT_DEFAULT;
- boolean ignoreTikaException = true;
+ boolean ignoreException = true;
for (int i = 0; i < os.getChildCount(); i++) {
SpecificationNode sn = os.getChild(i);
@@ -1235,6 +1262,9 @@ public class TikaExtractor extends
org.apache.manifoldcf.agents.transformation.B
} else if (sn.getType().equals(TikaConfig.NODE_LOWERNAMES)) {
String value = sn.getAttributeValue(TikaConfig.ATTRIBUTE_VALUE);
lowerNames = Boolean.parseBoolean(value);
+ } else if (sn.getType().equals(TikaConfig.NODE_IGNORETIKAEXCEPTION)) {
+ String value = sn.getAttributeValue(TikaConfig.ATTRIBUTE_VALUE);
+ ignoreException = Boolean.parseBoolean(value);
} else if (sn.getType().equals(TikaConfig.NODE_WRITELIMIT)) {
String value = sn.getAttributeValue(TikaConfig.ATTRIBUTE_VALUE);
if (value.length() == 0) {
@@ -1254,6 +1284,7 @@ public class TikaExtractor extends
org.apache.manifoldcf.agents.transformation.B
}
this.keepAllMetadata = keepAllMetadata;
this.lowerNames = lowerNames;
+ this.ignoreException = ignoreException;
this.writeLimit = writeLimit;
}
@@ -1290,6 +1321,10 @@ public class TikaExtractor extends
org.apache.manifoldcf.agents.transformation.B
sb.append('+');
else
sb.append('-');
+ if (ignoreException)
+ sb.append('+');
+ else
+ sb.append('-');
if (writeLimit != TikaConfig.WRITELIMIT_DEFAULT) {
sb.append('+');
@@ -1311,6 +1346,10 @@ public class TikaExtractor extends
org.apache.manifoldcf.agents.transformation.B
return lowerNames;
}
+ public boolean ignoreException() {
+ return ignoreException;
+ }
+
public int writeLimit() {
return writeLimit;
}
diff --git
a/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_en_US.properties
b/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_en_US.properties
index d8abce8d8..ec4a17ed3 100644
---
a/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_en_US.properties
+++
b/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_en_US.properties
@@ -23,6 +23,7 @@ TikaExtractor.FinalFieldName=Final field name
TikaExtractor.NoFieldMappingSpecified=No field mapping specified
TikaExtractor.KeepAllMetadata=Keep all metadata:
TikaExtractor.LowerNames=Lower names:
+TikaExtractor.IgnoreTikaExceptions=Ignore Tika exceptions:
TikaExtractor.WriteLimit=Write limit:
TikaExtractor.Add=Add
TikaExtractor.AddFieldMapping=Add field mapping
diff --git
a/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_es_ES.properties
b/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_es_ES.properties
index 80034d7cb..2f1075496 100644
---
a/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_es_ES.properties
+++
b/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_es_ES.properties
@@ -20,6 +20,7 @@ TikaExtractor.FinalFieldName=Nombre de campo final
TikaExtractor.NoFieldMappingSpecified=Ninguna asignación campo especificado
TikaExtractor.KeepAllMetadata=Mantenga todos los metadatos:
TikaExtractor.LowerNames=nombres Menores:
+TikaExtractor.IgnoreTikaExceptions=Ignorar las excepciones de Tika:
TikaExtractor.WriteLimit=límite Comentario:
TikaExtractor.Add=Añadir
TikaExtractor.AddFieldMapping=Añadir asignación de campos
diff --git
a/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_ja_JP.properties
b/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_ja_JP.properties
index 28828cd78..ea5ff0b30 100644
---
a/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_ja_JP.properties
+++
b/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_ja_JP.properties
@@ -23,6 +23,7 @@ TikaExtractor.FinalFieldName=最後のフィールド名
TikaExtractor.NoFieldMappingSpecified=フィールドマッピングを指定してください
TikaExtractor.KeepAllMetadata=全メタデータを保存:
TikaExtractor.LowerNames=小文字名:
+TikaExtractor.IgnoreTikaExceptions=Tika例外を無視:
TikaExtractor.WriteLimit=最大文字長:
TikaExtractor.Add=追加
TikaExtractor.AddFieldMapping=フィールドマッピングを追加
diff --git
a/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_zh_CN.properties
b/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_zh_CN.properties
index 77dfa7061..08b5d2b93 100644
---
a/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_zh_CN.properties
+++
b/connectors/tikaservice/connector/src/main/native2ascii/org/apache/manifoldcf/agents/transformation/tikaservice/common_zh_CN.properties
@@ -23,6 +23,7 @@ TikaExtractor.FinalFieldName=最终字段名
TikaExtractor.NoFieldMappingSpecified=未指定字段映射
TikaExtractor.KeepAllMetadata=保存所有元数据:
TikaExtractor.LowerNames=小写:
+TikaExtractor.IgnoreTikaExceptions=忽略Tika异常:
TikaExtractor.WriteLimit=最大字符长度:
TikaExtractor.Add=添加
TikaExtractor.AddFieldMapping=添加字段映射
diff --git
a/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editSpecification_FieldMapping.html
b/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editSpecification_FieldMapping.html
index 8050aa713..c15e3f586 100644
---
a/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editSpecification_FieldMapping.html
+++
b/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/editSpecification_FieldMapping.html
@@ -103,6 +103,17 @@
</td>
</tr>
+ <tr>
+ <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.IgnoreTikaExceptions'))</nobr></td>
+ <td class="value">
+ #if($IGNORETIKAEXCEPTIONS == 'true')
+ <input type="checkbox" checked="true"
name="s${SEQNUM}_ignoretikaexceptions" value="true"/>
+ #else
+ <input type="checkbox" name="s${SEQNUM}_ignoretikaexceptions"
value="true"/>
+ #end
+ </td>
+ </tr>
+
<tr>
<td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.WriteLimit'))</nobr></td>
<td class="value"><input name="s${SEQNUM}_writelimit" type="text"
@@ -122,6 +133,7 @@
<input type="hidden" name="s${SEQNUM}_fieldmapping_count"
value="$fieldcounter"/>
<input type="hidden" name="s${SEQNUM}_keepallmetadata"
value="$Encoder.bodyEscape($KEEPALLMETADATA)"/>
<input type="hidden" name="s${SEQNUM}_lowernames"
value="$Encoder.bodyEscape($LOWERNAMES)"/>
+<input type="hidden" name="s${SEQNUM}_ignoretikaexceptions"
value="$Encoder.bodyEscape($IGNORETIKAEXCEPTIONS)"/>
<input type="hidden" name="s${SEQNUM}_writelimit"
value="$Encoder.attributeEscape($WRITELIMIT)" />
#end
\ No newline at end of file
diff --git
a/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/viewSpecification.html
b/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/viewSpecification.html
index 379080639..175966841 100644
---
a/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/viewSpecification.html
+++
b/connectors/tikaservice/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/tikaservice/viewSpecification.html
@@ -57,6 +57,11 @@
<td class="value"><nobr>$Encoder.bodyEscape($LOWERNAMES)</nobr></td>
</tr>
<tr><td class="separator" colspan="2"><hr/></td></tr>
+ <tr>
+ <td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.IgnoreTikaExceptions'))</nobr></td>
+ <td
class="value"><nobr>$Encoder.bodyEscape($IGNORETIKAEXCEPTIONS)</nobr></td>
+ </tr>
+ <tr><td class="separator" colspan="2"><hr/></td></tr>
<tr>
<td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('TikaExtractor.WriteLimit'))</nobr></td>
<td class="value"><nobr>$Encoder.bodyEscape($WRITELIMIT)</nobr></td>
diff --git
a/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
b/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
index 8dadea63b..c3adcdc85 100644
---
a/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
+++
b/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
@@ -1254,7 +1254,7 @@ public class DBInterfaceMySQL extends Database implements
IDBInterface
{
try
{
- executeViaThread(connection.getConnection(),"START
TRANSACTION",null,false,0,null,null);
+
executeViaThread((connection==null)?null:connection.getConnection(),"START
TRANSACTION",null,false,0,null,null);
}
catch (ManifoldCFException e)
{
@@ -1268,7 +1268,7 @@ public class DBInterfaceMySQL extends Database implements
IDBInterface
{
try
{
-
executeViaThread(connection.getConnection(),"COMMIT",null,false,0,null,null);
+
executeViaThread((connection==null)?null:connection.getConnection(),"COMMIT",null,false,0,null,null);
}
catch (ManifoldCFException e)
{
@@ -1314,7 +1314,7 @@ public class DBInterfaceMySQL extends Database implements
IDBInterface
{
try
{
-
executeViaThread(connection.getConnection(),"ROLLBACK",null,false,0,null,null);
+
executeViaThread((connection==null)?null:connection.getConnection(),"ROLLBACK",null,false,0,null,null);
}
catch (ManifoldCFException e)
{
