Author: kwright
Date: Mon Jan 14 18:19:37 2013
New Revision: 1433020
URL: http://svn.apache.org/viewvc?rev=1433020&view=rev
Log:
Fix for CONNECTORS-611. If permissions can't be found for a document, just
skip the document.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1433020&r1=1433019&r2=1433020&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Jan 14 18:19:37 2013
@@ -3,6 +3,10 @@ $Id$
======================= 1.1-dev =====================
+CONNECTORS-611: Handle inability to get permissions for funky docs
+by skipping those docs, rather than throwing an NPE.
+(Ahmet Arslan, Karl Wright)
+
CONNECTORS-610: Can't use retries with httpclient instance used
with solrj, so disable retries explicitly.
(Ahmet Arslan, Karl Wright)
Modified:
manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java?rev=1433020&r1=1433019&r2=1433020&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java
(original)
+++
manifoldcf/trunk/connectors/sharepoint/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharepoint/SPSProxyHelper.java
Mon Jan 14 18:19:37 2013
@@ -321,6 +321,12 @@ public class SPSProxyHelper {
com.microsoft.sharepoint.webpartpages.PermissionsSoap aclCall =
aclService.getPermissionsSoapHandler( );
com.microsoft.sharepoint.webpartpages.GetPermissionCollectionResponseGetPermissionCollectionResult
aclResult = aclCall.getPermissionCollection( encodedRelativePath, "Item" );
+ if (aclResult == null)
+ {
+ Logging.connectors.debug("SharePoint: document acls were null");
+ return null;
+ }
+
org.apache.axis.message.MessageElement[] aclList = aclResult.get_any();
if (Logging.connectors.isDebugEnabled())
