Return-Path: X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BB67910DCD for ; Mon, 10 Feb 2014 13:19:03 +0000 (UTC) Received: (qmail 26269 invoked by uid 500); 10 Feb 2014 13:19:03 -0000 Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org Received: (qmail 26229 invoked by uid 500); 10 Feb 2014 13:19:02 -0000 Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@manifoldcf.apache.org Delivered-To: mailing list commits@manifoldcf.apache.org Received: (qmail 26221 invoked by uid 99); 10 Feb 2014 13:19:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Feb 2014 13:19:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Feb 2014 13:18:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0B1E7238899C; Mon, 10 Feb 2014 13:18:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: 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 Date: Mon, 10 Feb 2014 13:18:38 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140210131839.0B1E7238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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)