svn commit: r1566615 - in /manifoldcf/branches/release-1.5-branch: ./ CHANGES.txt connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java

[kwright]

Author: kwright
Date: Mon Feb 10 13:18:38 2014
New Revision: 1566615

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

Modified:
    manifoldcf/branches/release-1.5-branch/   (props changed)
    manifoldcf/branches/release-1.5-branch/CHANGES.txt
    
manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java

Propchange: manifoldcf/branches/release-1.5-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1565362

Modified: manifoldcf/branches/release-1.5-branch/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/CHANGES.txt?rev=1566615&r1=1566614&r2=1566615&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.5-branch/CHANGES.txt Mon Feb 10 13:18:38 2014
@@ -4,6 +4,9 @@ $Id$
 
 ======================= Release 1.5.1 =====================
 
+CONNECTORS-884: Log successful index/delete in Solr connector.
+(Erlend Garåsen, Karl Wright)
+
 CONNECTORS-882: Solr connector: Keep all metadata fixed.
 (Alessandro Benedetti, Karl Wright)
 

Modified: 
manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java?rev=1566615&r1=1566614&r2=1566615&view=diff
==============================================================================
--- 
manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
 (original)
+++ 
manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
 Mon Feb 10 13:18:38 2014
@@ -523,6 +523,9 @@ public class HttpPoster
         t.start();
         t.finishUp();
 
+        if (t.getActivityCode() != null)
+          
activities.recordActivity(t.getActivityStart(),SolrConnector.INGEST_ACTIVITY,t.getActivityBytes(),documentURI,t.getActivityCode(),t.getActivityDetails());
+
         return t.getRval();
       }
       catch (InterruptedException e)
@@ -641,6 +644,10 @@ public class HttpPoster
       {
         t.start();
         t.finishUp();
+        
+        if (t.getActivityCode() != null)
+          
activities.recordActivity(t.getActivityStart(),SolrConnector.REMOVE_ACTIVITY,null,documentURI,t.getActivityCode(),t.getActivityDetails());
+
         return;
       }
       catch (InterruptedException e)