Pull up fix for CONNECTORS-1127
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/release-1.8-branch@1646952 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index addac39..f791d07 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,10 @@
======================= Release 1.8 =====================
+CONNECTORS-1127: Fix boilerplate extraction to be compatible with
+current version of boilerplate.
+(Kamil Żyta, Karl Wright)
+
CONNECTORS-1126: Fix LockGate release logic to not flush LockGate
objects so aggressively.
diff --git a/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java b/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java
index b3d1400..18513e5 100644
--- a/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java
+++ b/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java
@@ -896,11 +896,10 @@
try {
ClassLoader loader = BoilerpipeExtractor.class.getClassLoader();
Class extractorClass = loader.loadClass(extractorClassName);
- return (BoilerpipeExtractor)extractorClass.newInstance();
+ java.lang.reflect.Field f = extractorClass.getField("INSTANCE");
+ return (BoilerpipeExtractor)f.get(null);
} catch (ClassNotFoundException e) {
throw new ManifoldCFException("Boilerpipe extractor class '"+extractorClassName+"' not found: "+e.getMessage(),e);
- } catch (InstantiationException e) {
- throw new ManifoldCFException("Boilerpipe extractor class '"+extractorClassName+"' could not be instantiated: "+e.getMessage(),e);
} catch (Exception e) {
throw new ManifoldCFException("Boilerpipe extractor class '"+extractorClassName+"' exception on instantiation: "+e.getMessage(),e);
}
