Author: kwright
Date: Thu May 22 23:27:59 2014
New Revision: 1596985
URL: http://svn.apache.org/r1596985
Log:
Pull up fix for CONNECTORS-936 from trunk
Modified:
manifoldcf/branches/release-1.6-branch/ (props changed)
manifoldcf/branches/release-1.6-branch/CHANGES.txt
manifoldcf/branches/release-1.6-branch/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java
manifoldcf/branches/release-1.6-branch/connectors/cmis/pom.xml
Propchange: manifoldcf/branches/release-1.6-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1594873
Modified: manifoldcf/branches/release-1.6-branch/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/CHANGES.txt?rev=1596985&r1=1596984&r2=1596985&view=diff
==============================================================================
--- manifoldcf/branches/release-1.6-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.6-branch/CHANGES.txt Thu May 22 23:27:59 2014
@@ -6,6 +6,9 @@ $Id$
CONNECTORS-938: Allow JSPs to all work properly with Java 8.
(Arcadius Ahouansou, Ahmet Arslan)
+CONNECTORS-936: Handle null content streams in CMIS connector.
+(Cetra Free)
+
======================= Release 1.6 =====================
CONNECTORS-928: Remove unused directory.
Modified:
manifoldcf/branches/release-1.6-branch/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java?rev=1596985&r1=1596984&r2=1596985&view=diff
==============================================================================
---
manifoldcf/branches/release-1.6-branch/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java
(original)
+++
manifoldcf/branches/release-1.6-branch/connectors/cmis/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/cmis/CmisRepositoryConnector.java
Thu May 22 23:27:59 2014
@@ -66,6 +66,8 @@ import org.apache.manifoldcf.crawler.int
import org.apache.manifoldcf.crawler.interfaces.ISeedingActivity;
import org.apache.manifoldcf.crawler.system.Logging;
+import org.apache.commons.io.input.NullInputStream;
+
/**
* This is the "repository connector" for a CMIS-compliant repository.
*
@@ -1098,6 +1100,8 @@ public class CmisRepositoryConnector ext
if(fileLength>0 && document.getContentStream()!=null){
is = document.getContentStream().getStream();
rd.setBinary(is, fileLength);
+ } else {
+ rd.setBinary(new NullInputStream(0),0);
}
//properties
Modified: manifoldcf/branches/release-1.6-branch/connectors/cmis/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.6-branch/connectors/cmis/pom.xml?rev=1596985&r1=1596984&r2=1596985&view=diff
==============================================================================
--- manifoldcf/branches/release-1.6-branch/connectors/cmis/pom.xml (original)
+++ manifoldcf/branches/release-1.6-branch/connectors/cmis/pom.xml Thu May 22
23:27:59 2014
@@ -224,6 +224,11 @@
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io.version}</version>
+ </dependency>
<!-- Test scope -->
<dependency>
