Author: kwright
Date: Mon Apr 25 13:12:39 2016
New Revision: 1740838
URL: http://svn.apache.org/viewvc?rev=1740838&view=rev
Log:
Fix for CONNECTORS-1302.
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=1740838&r1=1740837&r2=1740838&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Apr 25 13:12:39 2016
@@ -3,6 +3,10 @@ $Id$
======================= 2.5-dev =====================
+CONNECTORS-1302: Catch newer version of 'in-use' SmbException in
+JCIFS connector.
+(Vince McNamara, Karl Wright)
+
CONNECTORS-1301: Addition of SSL to LDAP connector broke non-SSL
functionality.
(Yulin He, 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=1740838&r1=1740837&r2=1740838&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
Mon Apr 25 13:12:39 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)
+ 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)
{
Logging.connectors.warn("JCIFS: 'Busy' response when processing
document/directory for "+documentIdentifier+": retrying...",se);
errorCode =
se.getClass().getSimpleName().toUpperCase(Locale.ROOT);
@@ -1292,7 +1292,7 @@ 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)
+ else if (se.getMessage().toLowerCase(Locale.ROOT).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: 'File in Use' response when "+activity+"
for "+documentIdentifier+": retrying...",se);
// 'File in Use' skip the document and keep going
