manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
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 GMT
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");
   }



Mime
View raw message