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 11EF517C77 for ; Tue, 14 Apr 2015 22:30:11 +0000 (UTC) Received: (qmail 96028 invoked by uid 500); 14 Apr 2015 22:30:10 -0000 Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org Received: (qmail 95982 invoked by uid 500); 14 Apr 2015 22:30:10 -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 95973 invoked by uid 99); 14 Apr 2015 22:30:10 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Apr 2015 22:30:10 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 80AFAAC0113 for ; Tue, 14 Apr 2015 22:30:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1673573 - in /manifoldcf/trunk: CHANGES.txt connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java Date: Tue, 14 Apr 2015 22:30:10 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150414223010.80AFAAC0113@hades.apache.org> Author: kwright Date: Tue Apr 14 22:30:09 2015 New Revision: 1673573 URL: http://svn.apache.org/r1673573 Log: Fix for CONNECTORS-1187 Modified: manifoldcf/trunk/CHANGES.txt manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java Modified: manifoldcf/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1673573&r1=1673572&r2=1673573&view=diff ============================================================================== --- manifoldcf/trunk/CHANGES.txt (original) +++ manifoldcf/trunk/CHANGES.txt Tue Apr 14 22:30:09 2015 @@ -3,6 +3,9 @@ $Id$ ======================= 2.1-dev ===================== +CONNECTORS-1187: Handle "File in Use" error properly in JCIFS connector. +(Karl Wright) + CONNECTORS-1186: HttpClient 4.4 requires that you set the SSL socket factory at the connection manager level. (Karl Wright) Modified: manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java?rev=1673573&r1=1673572&r2=1673573&view=diff ============================================================================== --- manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java (original) +++ manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java Tue Apr 14 22:30:09 2015 @@ -1266,6 +1266,13 @@ public class SharedDriveConnector extend throw new ServiceInterruption("Timeout or other service interruption: "+se.getMessage(),se,currentTime + 300000L, currentTime + 3 * 60 * 60000L,-1,false); } + else if (se.getMessage().toLowerCase(Locale.ROOT).indexOf("file in use") != -1) + { + Logging.connectors.warn("JCIFS: 'File in Use' response when "+activity+" for "+documentIdentifier+": retrying...",se); + // 'File in Use' skip the document and keep going + throw new ServiceInterruption("Timeout or other service interruption: "+se.getMessage(),se,currentTime + 300000L, + currentTime + 3 * 60 * 60000L,-1,false); + } else if (se.getMessage().indexOf("cannot find") != -1 || se.getMessage().indexOf("cannot be found") != -1) { return;