Author: kwright
Date: Tue Oct 21 11:16:16 2014
New Revision: 1633341
URL: http://svn.apache.org/r1633341
Log:
Pull up more CONNECTORS-1077-related work from trunk
Modified:
manifoldcf/branches/dev_1x/ (props changed)
manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1633339
Modified:
manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java?rev=1633341&r1=1633340&r2=1633341&view=diff
==============================================================================
---
manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
(original)
+++
manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
Tue Oct 21 11:16:16 2014
@@ -537,7 +537,7 @@ public class HttpPoster
// If the document is too long, reject it.
if (maxDocumentLength != null && document.getBinaryLength() >
maxDocumentLength.longValue()){
-
activities.recordActivity(null,SolrConnector.INGEST_ACTIVITY,null,documentURI,activities.EXCLUDED_LENGTH,"Solr
connector rejected document due to its big size.
('"+document.getBinaryLength()+"')");
+
activities.recordActivity(null,SolrConnector.INGEST_ACTIVITY,null,documentURI,activities.EXCLUDED_LENGTH,"Solr
connector rejected document due to its big size:
('"+document.getBinaryLength()+"')");
return false;
}
@@ -558,7 +558,7 @@ public class HttpPoster
if (!aclType.equals(RepositoryDocument.SECURITY_TYPE_DOCUMENT) &&
!aclType.equals(RepositoryDocument.SECURITY_TYPE_SHARE) &&
!aclType.startsWith(RepositoryDocument.SECURITY_TYPE_PARENT)){
-
activities.recordActivity(null,SolrConnector.INGEST_ACTIVITY,null,documentURI,activities.UNKNOWN_SECURITY,"Solr
connector rejected document that has security info which is unknown.");
+
activities.recordActivity(null,SolrConnector.INGEST_ACTIVITY,null,documentURI,activities.UNKNOWN_SECURITY,"Solr
connector rejected document that has security info which Solr does not
recognize: '"+aclType + "'");
return false;
}
