svn commit: r1646950 - in /manifoldcf/branches/release-2.0-branch: ./ CHANGES.txt connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java

[kwright]

Author: kwright
Date: Sat Dec 20 11:00:53 2014
New Revision: 1646950

URL: http://svn.apache.org/r1646950
Log:
Pull up fix for CONNECTORS-1127 from trunk.

Modified:
    manifoldcf/branches/release-2.0-branch/   (props changed)
    manifoldcf/branches/release-2.0-branch/CHANGES.txt
    
manifoldcf/branches/release-2.0-branch/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java

Propchange: manifoldcf/branches/release-2.0-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 20 11:00:53 2014
@@ -119,4 +119,4 @@
 /manifoldcf/branches/CONNECTORS-981:1605049-1605773
 /manifoldcf/branches/CONNECTORS-989:1611600-1612101
 /manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1644252,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646640
+/manifoldcf/trunk:1644252,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646640,1646947

Modified: manifoldcf/branches/release-2.0-branch/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.0-branch/CHANGES.txt?rev=1646950&r1=1646949&r2=1646950&view=diff
==============================================================================
--- manifoldcf/branches/release-2.0-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-2.0-branch/CHANGES.txt Sat Dec 20 11:00:53 2014
@@ -4,6 +4,10 @@ $Id$
 
 ======================= 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.
 

Modified: 
manifoldcf/branches/release-2.0-branch/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.0-branch/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java?rev=1646950&r1=1646949&r2=1646950&view=diff
==============================================================================
--- 
manifoldcf/branches/release-2.0-branch/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java
 (original)
+++ 
manifoldcf/branches/release-2.0-branch/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java
 Sat Dec 20 11:00:53 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);
       }