From commits-return-9969-archive-asf-public=cust-asf.ponee.io@manifoldcf.apache.org Thu Feb 28 13:03:33 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 1D43C180657 for ; Thu, 28 Feb 2019 14:03:32 +0100 (CET) Received: (qmail 42595 invoked by uid 500); 28 Feb 2019 13:03:32 -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 42586 invoked by uid 99); 28 Feb 2019 13:03:32 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Feb 2019 13:03:32 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 62FE63A008F for ; Thu, 28 Feb 2019 13:03:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1854522 - in /manifoldcf/trunk: CHANGES.txt connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java Date: Thu, 28 Feb 2019 13:03:30 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20190228130331.62FE63A008F@svn01-us-west.apache.org> Author: kwright Date: Thu Feb 28 13:03:30 2019 New Revision: 1854522 URL: http://svn.apache.org/viewvc?rev=1854522&view=rev Log: Fix for CONNECTORS-1588. Committed on behalf Cihad Guzel. 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=1854522&r1=1854521&r2=1854522&view=diff ============================================================================== --- manifoldcf/trunk/CHANGES.txt (original) +++ manifoldcf/trunk/CHANGES.txt Thu Feb 28 13:03:30 2019 @@ -3,6 +3,10 @@ $Id$ ======================= 2.13-dev ===================== +CONNECTORS-1588: Apply override of jcifs properties only if they are not +already specified. +(Cihad Guzel) + CONNECTORS-1579: Fix for JDBC connector's incorrect tracking of rejected documents. (Donald Van den Driessche, 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=1854522&r1=1854521&r2=1854522&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 Thu Feb 28 13:03:30 2019 @@ -104,9 +104,17 @@ public class SharedDriveConnector extend // before jcifs is loaded. static { - System.setProperty("jcifs.smb.client.soTimeout","150000"); - System.setProperty("jcifs.smb.client.responseTimeout","120000"); - System.setProperty("jcifs.resolveOrder","LMHOSTS,DNS,WINS"); + if (System.getProperty("jcifs.resolveOrder") == null) { + System.setProperty("jcifs.resolveOrder","LMHOSTS,DNS,WINS"); + } + if (System.getProperty("jcifs.smb.client.soTimeout") == null) { + System.setProperty("jcifs.smb.client.soTimeout","150000"); + } + if (System.getProperty("jcifs.smb.client.responseTimeout") == null) { + System.setProperty("jcifs.smb.client.responseTimeout","120000"); + } + + // Don't change these!! System.setProperty("jcifs.smb.client.listCount","20"); System.setProperty("jcifs.smb.client.dfs.strictView","true"); }