Author: kwright
Date: Fri Oct 25 20:35:24 2019
New Revision: 1868956
URL: http://svn.apache.org/viewvc?rev=1868956&view=rev
Log:
CONNECTORS-1627: Fix NPE for documents that have no owner.
Modified:
manifoldcf/trunk/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java
Modified:
manifoldcf/trunk/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java?rev=1868956&r1=1868955&r2=1868956&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java
(original)
+++
manifoldcf/trunk/connectors/csws/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/csws/CswsConnector.java
Fri Oct 25 20:35:24 2019
@@ -1273,7 +1273,8 @@ public class CswsConnector extends org.a
Logging.connectors.debug("Csws: Decided to ingest document "+objID);
// Index it
- ingestFromCsws(llc, documentIdentifier, versionString, actualAcls,
denyAcls, rights.getOwnerRight().getRightID(), categoryPaths, activities, desc,
sDesc);
+ ingestFromCsws(llc, documentIdentifier, versionString, actualAcls,
denyAcls,
+
(rights==null)?null:(rights.getOwnerRight()==null)?null:rights.getOwnerRight().getRightID(),
categoryPaths, activities, desc, sDesc);
if (Logging.connectors.isDebugEnabled())
Logging.connectors.debug("Csws: Done processing document "+objID);
@@ -2673,7 +2674,7 @@ public class CswsConnector extends org.a
protected void ingestFromCsws(CswsContext llc,
String documentIdentifier, String version,
String[] actualAcls, String[] denyAcls,
- long ownerID,
+ Long ownerID,
String[] categoryPaths,
IProcessActivity activities,
MetadataDescription desc, SystemMetadataDescription sDesc)
@@ -2810,7 +2811,7 @@ public class CswsConnector extends org.a
if (parentID != null)
rd.addField(GENERAL_PARENTID,parentID.toString());
- UserInformation owner = llc.getUserInformation(ownerID); // from
ObjectRights
+ UserInformation owner = ownerID ==
null?null:llc.getUserInformation(ownerID); // from ObjectRights
UserInformation creator = llc.getUserInformation(objInfo.getCreatorId());
UserInformation modifier = llc.getUserInformation(versInfo.getOwnerId());
if (owner != null)
