manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1748101 - in /manifoldcf/trunk: CHANGES.txt framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
Date Mon, 13 Jun 2016 07:17:31 GMT
Author: kwright
Date: Mon Jun 13 07:17:31 2016
New Revision: 1748101

URL: http://svn.apache.org/viewvc?rev=1748101&view=rev
Log:
Fix for CONNECTORS-1323.

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1748101&r1=1748100&r2=1748101&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Jun 13 07:17:31 2016
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 2.5-dev =====================
 
+CONNECTORS-1323: When there were multiple outputs, the second,
+third, etc outputs would not have their activities properly logged.
+(Karl Wright)
+
 CONNECTORS-1322: Fix email connector "from" field.
 (Olivier Tavard)
 

Modified: manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java?rev=1748101&r1=1748100&r2=1748101&view=diff
==============================================================================
--- manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
(original)
+++ manifoldcf/trunk/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
Mon Jun 13 07:17:31 2016
@@ -982,7 +982,7 @@ public class IncrementalIngester extends
   public void documentDeleteMultiple(
     IPipelineConnections pipelineConnections,
     String[] identifierClasses, String[] identifierHashes,
-    IOutputRemoveActivity activities)
+    IOutputRemoveActivity originalActivities)
     throws ManifoldCFException, ServiceInterruption
   {
     String[] outputConnectionNames = pipelineConnections.getOutputConnectionNames();
@@ -994,7 +994,7 @@ public class IncrementalIngester extends
       String outputConnectionName = outputConnectionNames[z];
       IOutputConnection connection = outputConnections[z];
 
-      activities = new OutputRemoveActivitiesWrapper(activities,outputConnectionName);
+      IOutputRemoveActivity activities = new OutputRemoveActivitiesWrapper(originalActivities,outputConnectionName);
 
       if (Logging.ingest.isDebugEnabled())
       {
@@ -1039,7 +1039,9 @@ public class IncrementalIngester extends
         for (DeleteInfo uri : uris)
         {
           if (uri.getURI() != null)
+          {
             removeDocument(connection,uri.getURI(),uri.getOutputVersion(),activities);
+          }
         }
 
         // Now, get rid of all rows that match the given uris.



Mime
View raw message