Winshare connector : remove remaining job abort case
@@ -618,19 +618,6 @@ public class SharedDriveConnector extends org.apache.manifoldcf.crawler.connecto
}
}
- // Check licence file presence
- final String conf_home = System.getenv("MAIN_DATAFARI_CONFIG_HOME");
- String licenceFilePath = null;
- File licence = null;
- if (conf_home != null && !conf_home.isEmpty()) {
- licenceFilePath = conf_home + File.separator + "licence.lc";
- licence = new File(licenceFilePath);
- }
-
- if (licence == null || !licence.exists() || !licence.isFile() || !licence.canRead() || !licence.canWrite()) {
- Logging.connectors.warn("The current connector is not allowed");
- } else {
-
for (final String documentIdentifier : documentIdentifiers) {
getSession();
@@ -1171,7 +1158,7 @@ public class SharedDriveConnector extends org.apache.manifoldcf.crawler.connecto
Logging.connectors.warn("JCIFS: 'Busy' response when processing document/directory for " + documentIdentifier + ": retrying...", se);
errorCode = se.getClass().getSimpleName().toUpperCase(Locale.ROOT);
errorDesc = "Busy: " + se.getMessage();
- throw new ServiceInterruption("Timeout or other service interruption: " + se.getMessage(), se, currentTime + 300000L, currentTime + 3 * 60 * 60000L, -1, true);
+ throw new ServiceInterruption("Timeout or other service interruption: " + se.getMessage(), se, currentTime + 300000L, currentTime + 3 * 60 * 60000L, -1, false);
} else if (se.getMessage().indexOf("handle is invalid") != -1) {
Logging.connectors.warn("JCIFS: 'Handle is invalid' response when processing document/directory for " + documentIdentifier + ": retrying...", se);
errorCode = se.getClass().getSimpleName().toUpperCase(Locale.ROOT);
@@ -1233,7 +1220,6 @@ public class SharedDriveConnector extends org.apache.manifoldcf.crawler.connecto
}
}
}
- }
protected static void handleIOException(final String documentIdentifier, final IOException e) throws ManifoldCFException, ServiceInterruption {
if (e instanceof java.net.SocketTimeoutException) {
