Return-Path: X-Original-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-connectors-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C88688E87 for ; Fri, 12 Aug 2011 16:35:30 +0000 (UTC) Received: (qmail 84058 invoked by uid 500); 12 Aug 2011 16:35:30 -0000 Delivered-To: apmail-incubator-connectors-commits-archive@incubator.apache.org Received: (qmail 83997 invoked by uid 500); 12 Aug 2011 16:35:30 -0000 Mailing-List: contact connectors-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: connectors-dev@incubator.apache.org Delivered-To: mailing list connectors-commits@incubator.apache.org Received: (qmail 83990 invoked by uid 99); 12 Aug 2011 16:35:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Aug 2011 16:35:29 +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; Fri, 12 Aug 2011 16:35:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 585312388897; Fri, 12 Aug 2011 16:35:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1157178 - in /incubator/lcf/trunk: CHANGES.txt framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java Date: Fri, 12 Aug 2011 16:35:09 -0000 To: connectors-commits@incubator.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110812163509.585312388897@eris.apache.org> Author: kwright Date: Fri Aug 12 16:35:08 2011 New Revision: 1157178 URL: http://svn.apache.org/viewvc?rev=1157178&view=rev Log: Fix for CONNECTORS-238. The end notification is a nicety, so if it fails don't keep retrying (unless ServiceInterruption is thrown). Modified: incubator/lcf/trunk/CHANGES.txt incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java Modified: incubator/lcf/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1157178&r1=1157177&r2=1157178&view=diff ============================================================================== --- incubator/lcf/trunk/CHANGES.txt (original) +++ incubator/lcf/trunk/CHANGES.txt Fri Aug 12 16:35:08 2011 @@ -3,6 +3,10 @@ $Id$ ======================= 0.3-dev ========================= +CONNECTORS-238: Hard errors from notification output connector method +should be noted and then ignored. +(Karl Wright) + CONNECTORS-61: Make it easy (and document) how to integrate ManifoldCF into an application. (Karl Wright) Modified: incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java?rev=1157178&r1=1157177&r2=1157178&view=diff ============================================================================== --- incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java (original) +++ incubator/lcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java Fri Aug 12 16:35:08 2011 @@ -113,7 +113,6 @@ public class JobNotificationThread exten try { connector.noteJobComplete(activity); - notifiedConnections.put(connections,connections); } catch (ServiceInterruption e) { @@ -130,8 +129,8 @@ public class JobNotificationThread exten throw e; // Nothing special; report the error and keep going. Logging.threads.error(e.getMessage(),e); - continue; } + notifiedConnections.put(connections,connections); } finally {