Fix for CONNECTORS-1323.
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/trunk@1748101 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index f168fcd..855b913 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,10 @@
======================= 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)
diff --git a/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java b/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
index 295485c..d3bf7bc 100644
--- a/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
+++ b/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/IncrementalIngester.java
@@ -982,7 +982,7 @@
public void documentDeleteMultiple(
IPipelineConnections pipelineConnections,
String[] identifierClasses, String[] identifierHashes,
- IOutputRemoveActivity activities)
+ IOutputRemoveActivity originalActivities)
throws ManifoldCFException, ServiceInterruption
{
String[] outputConnectionNames = pipelineConnections.getOutputConnectionNames();
@@ -994,7 +994,7 @@
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 @@
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.
