Author: kwright
Date: Wed Sep 17 01:26:42 2014
New Revision: 1625451
URL: http://svn.apache.org/r1625451
Log:
Pull up changes for CONNECTORS-1025 from dev_1x branch
Modified:
manifoldcf/branches/release-1.7-branch/ (props changed)
manifoldcf/branches/release-1.7-branch/CHANGES.txt
manifoldcf/branches/release-1.7-branch/connectors/sharepoint/ (props
changed)
manifoldcf/branches/release-1.7-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
Propchange: manifoldcf/branches/release-1.7-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/dev_1x:r1623600
Merged /manifoldcf/trunk:r1623599
Modified: manifoldcf/branches/release-1.7-branch/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.7-branch/CHANGES.txt?rev=1625451&r1=1625450&r2=1625451&view=diff
==============================================================================
--- manifoldcf/branches/release-1.7-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.7-branch/CHANGES.txt Wed Sep 17 01:26:42 2014
@@ -8,6 +8,9 @@ CONNECTORS-1031: Fix Zookeeper synchroni
against short tick time settings.
(Karl Wright)
+CONNECTORS-1025: SharePoint connector should skip blocked files.
+(Radek Sklenicka, Karl Wright)
+
CONNECTORS-1024: Non-null components always failed due to a
null pointer exception.
(Karl Wright)
Propchange: manifoldcf/branches/release-1.7-branch/connectors/sharepoint/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk/connectors/sharepoint:r1623599
Merged /manifoldcf/branches/dev_1x/connectors/sharepoint:r1623600
Modified:
manifoldcf/branches/release-1.7-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.7-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java?rev=1625451&r1=1625450&r2=1625451&view=diff
==============================================================================
---
manifoldcf/branches/release-1.7-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
(original)
+++
manifoldcf/branches/release-1.7-branch/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SharePointRepository.java
Wed Sep 17 01:26:42 2014
@@ -1899,7 +1899,7 @@ public class SharePointRepository extend
emt.start();
int returnCode = emt.finishUp();
- if (returnCode == 404 || returnCode == 401 || returnCode ==
400)
+ if (returnCode == 404 || returnCode == 401 || returnCode ==
400 || returnCode == 415)
{
// Well, sharepoint thought the document was there, but it
really isn't, so delete it.
if (Logging.connectors.isDebugEnabled())
