svn commit: r1646947 - in /manifoldcf/trunk: CHANGES.txt connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java

[kwright]

Author: kwright
Date: Sat Dec 20 10:54:47 2014
New Revision: 1646947

URL: http://svn.apache.org/r1646947
Log:
Fix for CONNECTORS-1127.

Modified:
    manifoldcf/trunk/CHANGES.txt
    
manifoldcf/trunk/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1646947&r1=1646946&r2=1646947&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Sat Dec 20 10:54:47 2014
@@ -3,11 +3,16 @@ $Id$
 
 ======================= 2.1-dev =====================
 
-CONNECTORS-1126: Fix LockGate release logic to not flush LockGate
-objects so aggressively.
 
 ======================= Release 2.0 =====================
 
+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.
+
 CONNECTORS-1124: start.jar in example-proprietary not working.
 (Shinichiro Abe, Karl Wright)
 

Modified: 
manifoldcf/trunk/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java?rev=1646947&r1=1646946&r2=1646947&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java
 (original)
+++ 
manifoldcf/trunk/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java
 Sat Dec 20 10:54:47 2014
@@ -896,11 +896,10 @@ public class TikaExtractor extends org.a
       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);
       }