svn commit: r1742743 - in /manifoldcf/trunk: CHANGES.txt connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java

[kwright]

Author: kwright
Date: Sat May  7 19:53:50 2016
New Revision: 1742743

URL: http://svn.apache.org/viewvc?rev=1742743&view=rev
Log:
Fix for CONNECTORS-1312.

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=1742743&r1=1742742&r2=1742743&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Sat May  7 19:53:50 2016
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 2.5-dev =====================
 
+CONNECTORS-1312: Treat "connection reset by peer" same way as "busy"
+in JCIFS connector.
+(Konstantin Avdeev, Karl Wright)
+
 CONNECTORS-1308: Update to Tika 1.12, and all associated downstream
 dependencies.
 (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=1742743&r1=1742742&r2=1742743&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
 Sat May  7 19:53:50 2016
@@ -1035,7 +1035,7 @@ public class SharedDriveConnector extend
               throw new ServiceInterruption("Timeout or other service 
interruption: "+cause.getMessage(),cause,currentTime + 300000L,
                 currentTime + 12 * 60 * 60000L,-1,false);
             }
-            if (se.getMessage().indexOf("busy") != -1 || 
se.getMessage().toLowerCase(Locale.ROOT).indexOf("file in use") != -1 || 
se.getMessage().toLowerCase(Locale.ROOT).indexOf("is being used") != -1)
+            if (se.getMessage().indexOf("reset by peer") != -1 || 
se.getMessage().indexOf("busy") != -1 || 
se.getMessage().toLowerCase(Locale.ROOT).indexOf("file in use") != -1 || 
se.getMessage().toLowerCase(Locale.ROOT).indexOf("is being used") != -1)
             {
               Logging.connectors.warn("JCIFS: 'Busy' response when processing 
document/directory for "+documentIdentifier+": retrying...",se);
               errorCode = 
se.getClass().getSimpleName().toUpperCase(Locale.ROOT);